From 197bd2e10ce69f64ca1c0cc548ae8a95acb2d4fd Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Mon, 3 Sep 2018 17:45:58 -0500 Subject: [PATCH] fix: gate unix-only macros (silences "unused" warnings) --- src/ls/ls.rs | 4 +++- src/uucore/fs.rs | 1 + tests/tests.rs | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ls/ls.rs b/src/ls/ls.rs index 7bfaf3461..d67ba6504 100644 --- a/src/ls/ls.rs +++ b/src/ls/ls.rs @@ -18,6 +18,7 @@ use pretty_bytes::converter::convert; use term_grid::{Cell, Direction, Filling, Grid, GridOptions}; use time::{strftime, Timespec}; +#[cfg(unix)] #[macro_use] extern crate lazy_static; @@ -587,11 +588,13 @@ fn color_name(name: String, typ: &str) -> String { } } +#[cfg(unix)] macro_rules! has { ($mode:expr, $perm:expr) => ( $mode & ($perm as mode_t) != 0 ) } + #[cfg(unix)] fn display_file_name( path: &Path, @@ -698,4 +701,3 @@ fn display_symlink_count(metadata: &Metadata) -> String { fn display_symlink_count(metadata: &Metadata) -> String { metadata.nlink().to_string() } - diff --git a/src/uucore/fs.rs b/src/uucore/fs.rs index 78ccfbef3..fdb82abe6 100644 --- a/src/uucore/fs.rs +++ b/src/uucore/fs.rs @@ -25,6 +25,7 @@ use std::io::Result as IOResult; use std::path::{Component, Path, PathBuf}; use std::borrow::Cow; +#[cfg(unix)] macro_rules! has { ($mode:expr, $perm:expr) => ( $mode & ($perm as u32) != 0 diff --git a/tests/tests.rs b/tests/tests.rs index 08552a4d5..5885d8f9b 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -1,6 +1,7 @@ #[macro_use] mod common; +#[cfg(unix)] #[macro_use] extern crate lazy_static;