rollup merge of #20289: nick29581/shadowing

r? eddyb
2014-12-29 16:36:49 -08:00 · 2014-12-29 16:36:49 -08:00 · 806cb35f4d
commit 806cb35f4d
parent d7a09cb2fd 9dce83ccd9
26 changed files with 401 additions and 193 deletions
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@ -1239,7 +1239,7 @@ mod bench {
    extern crate test;
    use self::test::Bencher;
    use super::*;
-    use prelude::*;
+    use prelude::{Clone, GenericPath};

    #[bench]
    fn join_home_dir(b: &mut Bencher) {