about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-12-17 18:21:25 +0000
committerbors <bors@rust-lang.org>2015-12-17 18:21:25 +0000
commit6734dccc3149d62d36a41979424e61dce4473267 (patch)
treea88207f6be3a2670e5cb007f39f34f7c744dc8a2 /src/libstd
parent9687a8a96978280824a557d32b30e619f857e6a7 (diff)
parentba20a862d4082d96c12fc928e900d3e507348a1a (diff)
downloadrust-6734dccc3149d62d36a41979424e61dce4473267.tar.gz
rust-6734dccc3149d62d36a41979424e61dce4473267.zip
Auto merge of #30325 - jseyfried:fixes_30078, r=nrc
This fixes a bug in which unused imports can get wrongly marked as used when checking for unused qualifications in `resolve_path` (issue #30078), and it removes unused imports that were previously undetected because of the bug.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/map.rs1
-rw-r--r--src/libstd/collections/hash/set.rs1
-rw-r--r--src/libstd/sys/unix/fs.rs2
3 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index 38c080febf1..9ab440f289e 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -24,7 +24,6 @@ use mem::{self, replace};
 use ops::{Deref, FnMut, FnOnce, Index};
 use option::Option::{self, Some, None};
 use rand::{self, Rng};
-use result::Result;
 
 use super::table::{
     self,
diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs
index 08f356463bc..761709d41e7 100644
--- a/src/libstd/collections/hash/set.rs
+++ b/src/libstd/collections/hash/set.rs
@@ -13,7 +13,6 @@ use clone::Clone;
 use cmp::{Eq, PartialEq};
 use core::marker::Sized;
 use default::Default;
-use fmt::Debug;
 use fmt;
 use hash::Hash;
 use iter::{Iterator, IntoIterator, ExactSizeIterator, FromIterator, Map, Chain, Extend};
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
index 8ea8f0c6c77..9ac11b442da 100644
--- a/src/libstd/sys/unix/fs.rs
+++ b/src/libstd/sys/unix/fs.rs
@@ -14,7 +14,7 @@ use os::unix::prelude::*;
 use ffi::{CString, CStr, OsString, OsStr};
 use fmt;
 use io::{self, Error, ErrorKind, SeekFrom};
-use libc::{self, c_int, size_t, off_t, c_char, mode_t};
+use libc::{self, c_int, off_t, c_char, mode_t};
 use mem;
 use path::{Path, PathBuf};
 use ptr;