From 1c7da36f767a4ebd5a37c695ddce3ffc14b8a45b Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Sun, 29 Nov 2015 20:23:01 -0500 Subject: [PATCH] Remove unused imports and macro attribute. --- src/mkdir/mkdir.rs | 6 ++++-- src/test/test.rs | 4 +++- src/whoami/platform/windows.rs | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mkdir/mkdir.rs b/src/mkdir/mkdir.rs index f1c4e97de..fa55bafbe 100644 --- a/src/mkdir/mkdir.rs +++ b/src/mkdir/mkdir.rs @@ -15,9 +15,8 @@ extern crate libc; #[macro_use] extern crate uucore; -use std::ffi::CString; use std::fs; -use std::io::{Error, Write}; +use std::io::Write; use std::path::{Path, PathBuf}; use uucore::fs::UUPathExt; @@ -137,6 +136,9 @@ fn mkdir(path: &Path, mode: u16, verbose: bool) -> i32 { #[cfg(unix)] fn chmod(path: &Path, mode: u16) -> i32 { + use std::ffi::CString; + use std::io::Error; + let directory = CString::new(path.as_os_str().to_str().unwrap()).unwrap_or_else(|e| crash!(1, "{}", e)); let mode = mode as libc::mode_t; diff --git a/src/test/test.rs b/src/test/test.rs index ee0303ea2..9cd3a589d 100644 --- a/src/test/test.rs +++ b/src/test/test.rs @@ -12,7 +12,7 @@ extern crate libc; use std::collections::HashMap; -use std::ffi::{CString, OsString}; +use std::ffi::OsString; use std::env::{args_os}; use std::str::{from_utf8}; @@ -328,6 +328,8 @@ enum PathCondition { fn path(path: &[u8], cond: PathCondition) -> bool { use libc::{stat, lstat, S_IFMT, S_IFLNK, S_IFBLK, S_IFCHR, S_IFDIR, S_IFREG}; use libc::{S_IFIFO, mode_t}; + use std::ffi::CString; + static S_ISUID: mode_t = 0o4000; static S_ISGID: mode_t = 0o2000; static S_IFSOCK: mode_t = 0o140000; diff --git a/src/whoami/platform/windows.rs b/src/whoami/platform/windows.rs index 0a8611952..eda1753bb 100644 --- a/src/whoami/platform/windows.rs +++ b/src/whoami/platform/windows.rs @@ -9,8 +9,6 @@ extern crate winapi; extern crate advapi32; - -#[macro_use] extern crate uucore; use std::ffi::OsString;