---

yaml
---
r: 46555
b: refs/heads/auto
c: 7e08d8f
h: refs/heads/master
i:
  46553: 670f745
  46551: 6df06da
v: v3

Author: alexcrichton

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0ded562e8364244c9c0da1d5f4dc97cd900b4fe4
+refs/heads/auto: 7e08d8f23cf284b95e0d6ca237633b6756898648

branches/auto/src/libcore/os.rs

@@ -566,13 +566,17 @@ pub fn path_exists(p: &Path) -> bool {
  *
  * If the given path is relative, return it prepended with the current working
  * directory. If the given path is already an absolute path, return it
- * as is.  This is a shortcut for calling os::getcwd().unsafe_join(p)
+ * as is.
  */
 // NB: this is here rather than in path because it is a form of environment
 // querying; what it does depends on the process working directory, not just
 // the input paths.
 pub fn make_absolute(p: &Path) -> Path {
-    getcwd().unsafe_join(p)
+    if p.is_absolute {
+        copy *p
+    } else {
+        getcwd().push_many(p.components)
+    }
 }
 
 

branches/auto/src/libcore/path.rs

@@ -64,9 +64,6 @@ pub trait GenericPath {
     pure fn push_many((&[~str])) -> Self;
     pure fn pop() -> Self;
 
-    pure fn unsafe_join((&Self)) -> Self;
-    pure fn is_restricted() -> bool;
-
     pure fn normalize() -> Self;
 }
 
@@ -488,19 +485,6 @@ impl GenericPath for PosixPath {
         self.push_many(other.components)
     }
 
-    pure fn unsafe_join(other: &PosixPath) -> PosixPath {
-        if other.is_absolute {
-            PosixPath { is_absolute: true,
-                        components: copy other.components }
-        } else {
-            self.push_rel(other)
-        }
-    }
-
-    pure fn is_restricted() -> bool {
-        false
-    }
-
     pure fn push_many(cs: &[~str]) -> PosixPath {
         let mut v = copy self.components;
         for cs.each |e| {
@@ -701,61 +685,6 @@ impl GenericPath for WindowsPath {
         self.push_many(other.components)
     }
 
-    pure fn unsafe_join(other: &WindowsPath) -> WindowsPath {
-        /* rhs not absolute is simple push */
-        if !other.is_absolute {
-            return self.push_many(other.components);
-        }
-
-        /* if rhs has a host set, then the whole thing wins */
-        match other.host {
-            Some(copy host) => {
-                return WindowsPath {
-                    host: Some(host),
-                    device: copy other.device,
-                    is_absolute: true,
-                    components: copy other.components
-                };
-            }
-            _ => {}
-        }
-
-        /* if rhs has a device set, then a part wins */
-        match other.device {
-            Some(copy device) => {
-                return WindowsPath {
-                    host: None,
-                    device: Some(device),
-                    is_absolute: true,
-                    components: copy other.components
-                };
-            }
-            _ => {}
-        }
-
-        /* fallback: host and device of lhs win, but the
-           whole path of the right */
-        WindowsPath {
-            host: copy self.host,
-            device: copy self.device,
-            is_absolute: self.is_absolute || other.is_absolute,
-            components: copy other.components
-        }
-    }
-
-    pure fn is_restricted() -> bool {
-        match self.filestem() {
-            Some(stem) => {
-                match stem.to_lower() {
-                    ~"con" | ~"aux" | ~"com1" | ~"com2" | ~"com3" | ~"com4" |
-                    ~"lpt1" | ~"lpt2" | ~"lpt3" | ~"prn" | ~"nul" => true,
-                    _ => false
-                }
-            },
-            None => false
-        }
-    }
-
     pure fn push_many(cs: &[~str]) -> WindowsPath {
         let mut v = copy self.components;
         for cs.each |e| {
@@ -796,10 +725,7 @@ impl GenericPath for WindowsPath {
     pure fn normalize() -> WindowsPath {
         return WindowsPath {
             host: copy self.host,
-            device: match self.device {
-                None => None,
-                Some(ref device) => Some(device.to_upper())
-            },
+            device: copy self.device,
             is_absolute: self.is_absolute,
             components: normalize(self.components)
         }
@@ -838,13 +764,13 @@ pub mod windows {
 
     pub pure fn extract_unc_prefix(s: &str) -> Option<(~str,~str)> {
         if (s.len() > 1 &&
-            (s[0] == '\\' as u8 || s[0] == '/' as u8) &&
-            s[0] == s[1]) {
+            s[0] == '\\' as u8 &&
+            s[1] == '\\' as u8) {
             let mut i = 2;
             while i < s.len() {
-                if is_sep(s[i]) {
+                if s[i] == '\\' as u8 {
                     let pre = s.slice(2, i);
-                    let mut rest = s.slice(i, s.len());
+                    let rest = s.slice(i, s.len());
                     return Some((pre, rest));
                 }
                 i += 1;
@@ -990,21 +916,13 @@ mod tests {
     #[test]
     fn test_extract_unc_prefixes() {
         assert windows::extract_unc_prefix("\\\\").is_none();
-        assert windows::extract_unc_prefix("//").is_none();
         assert windows::extract_unc_prefix("\\\\hi").is_none();
-        assert windows::extract_unc_prefix("//hi").is_none();
         assert windows::extract_unc_prefix("\\\\hi\\") ==
             Some((~"hi", ~"\\"));
-        assert windows::extract_unc_prefix("//hi\\") ==
-            Some((~"hi", ~"\\"));
         assert windows::extract_unc_prefix("\\\\hi\\there") ==
             Some((~"hi", ~"\\there"));
-        assert windows::extract_unc_prefix("//hi/there") ==
-            Some((~"hi", ~"/there"));
         assert windows::extract_unc_prefix("\\\\hi\\there\\friends.txt") ==
             Some((~"hi", ~"\\there\\friends.txt"));
-        assert windows::extract_unc_prefix("//hi\\there\\friends.txt") ==
-            Some((~"hi", ~"\\there\\friends.txt"));
     }
 
     #[test]
@@ -1063,61 +981,5 @@ mod tests {
             .push_many([~"lib", ~"thingy.dll"])
             .with_filename("librustc.dll")),
           "c:\\program files (x86)\\rust\\lib\\librustc.dll");
-
-        t(&(WindowsPath("\\\\computer\\share")
-            .unsafe_join(&WindowsPath("\\a"))),
-          "\\\\computer\\a");
-
-        t(&(WindowsPath("//computer/share")
-            .unsafe_join(&WindowsPath("\\a"))),
-          "\\\\computer\\a");
-
-        t(&(WindowsPath("//computer/share")
-            .unsafe_join(&WindowsPath("\\\\computer\\share"))),
-          "\\\\computer\\share");
-
-        t(&(WindowsPath("C:/whatever")
-            .unsafe_join(&WindowsPath("//computer/share/a/b"))),
-          "\\\\computer\\share\\a\\b");
-
-        t(&(WindowsPath("C:")
-            .unsafe_join(&WindowsPath("D:/foo"))),
-          "D:\\foo");
-
-        t(&(WindowsPath("C:")
-            .unsafe_join(&WindowsPath("B"))),
-          "C:B");
-
-        t(&(WindowsPath("C:")
-            .unsafe_join(&WindowsPath("/foo"))),
-          "C:\\foo");
-
-        t(&(WindowsPath("C:\\")
-            .unsafe_join(&WindowsPath("\\bar"))),
-          "C:\\bar");
-
-        t(&(WindowsPath("")
-            .unsafe_join(&WindowsPath(""))),
-          "");
-
-        t(&(WindowsPath("")
-            .unsafe_join(&WindowsPath("a"))),
-          "a");
-
-        t(&(WindowsPath("")
-            .unsafe_join(&WindowsPath("C:\\a"))),
-          "C:\\a");
-
-        t(&(WindowsPath("c:\\foo")
-            .normalize()),
-          "C:\\foo");
-    }
-
-    #[test]
-    fn test_windows_path_restrictions() {
-        assert WindowsPath("hi").is_restricted() == false;
-        assert WindowsPath("C:\\NUL").is_restricted() == true;
-        assert WindowsPath("C:\\COM1.TXT").is_restricted() == true;
-        assert WindowsPath("c:\\prn.exe").is_restricted() == true;
     }
 }

branches/auto/src/librustc/middle/resolve.rs

@@ -5285,10 +5285,13 @@ pub impl Resolver {
         for module_.import_resolutions.each_value |&import_resolution| {
             // Ignore dummy spans for things like automatically injected
             // imports for the prelude, and also don't warn about the same
-            // import statement being unused more than once.
+            // import statement being unused more than once. Furthermore, if
+            // the import is public, then we can't be sure whether it's unused
+            // or not so don't warn about it.
             if !import_resolution.state.used &&
                     !import_resolution.state.warned &&
-                    import_resolution.span != dummy_sp() {
+                    import_resolution.span != dummy_sp() &&
+                    import_resolution.privacy != Public {
                 import_resolution.state.warned = true;
                 match self.unused_import_lint_level {
                     warn => {

branches/auto/src/test/compile-fail/unused-imports-warn.rs

@@ -31,6 +31,9 @@ mod foo {
 }
 
 mod bar {
+    // Don't ignore on 'pub use' because we're not sure if it's used or not
+    pub use core::cmp::Eq;
+
     pub mod c {
         use foo::Point;
         use foo::Square; //~ ERROR unused import