RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

ls: silence clippy warnings if feat_selinx is not set

Browse source
This commit is contained in:
Jan Scheer 2021-09-22 13:49:08 +02:00
parent 8f229aad87
commit 8cd8c25b0d
No known key found for this signature in database
GPG key ID: C62AD4C29E2B9828
1 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/uu/ls/src/ls.rs
View file

@ -1259,7 +1259,11 @@ impl PathData {
None => OnceCell::new(), None => OnceCell::new(),
}; };
let security_context = get_security_context(config, &p_buf, must_dereference); let security_context = if config.context {
get_security_context(config, &p_buf, must_dereference)
} else {
String::new()
};
Self { Self {
md: OnceCell::new(), md: OnceCell::new(),
@ -2089,9 +2093,9 @@ fn display_symlink_count(metadata: &Metadata) -> String {
// This returns the SELinux security context as UTF8 `String`. // This returns the SELinux security context as UTF8 `String`.
// In the long term this should be changed to `OsStr`, see discussions at #2621/#2656 // In the long term this should be changed to `OsStr`, see discussions at #2621/#2656
fn get_security_context(config: &Config, p_buf: &PathBuf, must_dereference: bool) -> String { #[allow(unused_variables)]
fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -> String {
let substitute_string = "?".to_string(); let substitute_string = "?".to_string();
if config.context {
if config.selinux_supported { if config.selinux_supported {
#[cfg(feature = "selinux")] #[cfg(feature = "selinux")]
{ {
@ -2126,7 +2130,4 @@ fn get_security_context(config: &Config, p_buf: &PathBuf, must_dereference: bool
} else { } else {
substitute_string substitute_string
} }
} else {
String::new()
}
} }