---

yaml
---
r: 30584
b: refs/heads/incoming
c: efa6675
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 3b013cd800ce675a445220105911bbefd2427e47
+refs/heads/incoming: efa6675f1d632f5d524f4a7a18838c6ee1c0c447
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/cargo/cargo.rs

@@ -804,7 +804,7 @@ fn install_source(c: cargo, path: &Path) {
 
     let mut cratefiles = ~[];
     for os::walk_dir(&Path(".")) |p| {
-        if p.filetype() == Some(~"rc") {
+        if p.filetype() == Some(~".rc") {
             vec::push(cratefiles, *p);
         }
     }

branches/incoming/src/fuzzer/fuzzer.rs

@@ -26,7 +26,7 @@ fn contains(haystack: ~str, needle: ~str) -> bool {
 }
 
 fn find_rust_files(files: &mut ~[Path], path: &Path) {
-    if path.filetype() == Some(~"rs") && !contains(path.to_str(), ~"utf8") {
+    if path.filetype() == Some(~".rs") && !contains(path.to_str(), ~"utf8") {
         // ignoring "utf8" tests because something is broken
         vec::push(*files, *path);
     } else if os::path_is_dir(path)

branches/incoming/src/libcore/path.rs

@@ -128,7 +128,7 @@ impl PosixPath : GenericPath {
           None => None,
           Some(ref f) => {
             match str::rfind_char(*f, '.') {
-              Some(p) if p+1 < f.len() => Some(f.slice(p+1, f.len())),
+              Some(p) if p < f.len() => Some(f.slice(p, f.len())),
               _ => None
             }
           }
@@ -153,8 +153,7 @@ impl PosixPath : GenericPath {
     pure fn with_filestem(s: &str) -> PosixPath {
         match self.filetype() {
           None => self.with_filename(s),
-          Some(ref t) =>
-          self.with_filename(str::from_slice(s) + "." + *t)
+          Some(ref t) => self.with_filename(str::from_slice(s) + *t)
         }
     }
 
@@ -168,8 +167,7 @@ impl PosixPath : GenericPath {
             let t = ~"." + str::from_slice(t);
             match self.filestem() {
               None => self.with_filename(t),
-              Some(ref s) =>
-              self.with_filename(*s + t)
+              Some(ref s) => self.with_filename(*s + t)
             }
         }
     }
@@ -321,7 +319,7 @@ impl WindowsPath : GenericPath {
           None => None,
           Some(ref f) => {
             match str::rfind_char(*f, '.') {
-              Some(p) if p+1 < f.len() => Some(f.slice(p+1, f.len())),
+              Some(p) if p < f.len() => Some(f.slice(p, f.len())),
               _ => None
             }
           }
@@ -344,8 +342,7 @@ impl WindowsPath : GenericPath {
     pure fn with_filestem(s: &str) -> WindowsPath {
         match self.filetype() {
           None => self.with_filename(s),
-          Some(ref t) =>
-          self.with_filename(str::from_slice(s) + "." + *t)
+          Some(ref t) => self.with_filename(str::from_slice(s) + *t)
         }
     }
 
@@ -470,6 +467,18 @@ mod posix {
         }
     }
 
+    #[test]
+    fn test_filetype_foo_bar() {
+        let wp = mk("foo.bar");
+        assert wp.filetype() == Some(~".bar");
+    }
+
+    #[test]
+    fn test_filetype_foo() {
+        let wp = mk("foo");
+        assert wp.filetype() == None;
+    }
+
     #[test]
     fn test_posix_paths() {
         t(&(mk("hi")), "hi");
@@ -642,4 +651,19 @@ mod windows {
 
     }
 
+    #[cfg(test)]
+    fn mk(s: &str) -> PosixPath { from_str::<PosixPath>(s) }
+
+    #[test]
+    fn test_filetype_foo_bar() {
+        let wp = mk("foo.bar");
+        assert wp.filetype() == Some(~".bar");
+    }
+
+    #[test]
+    fn test_filetype_foo() {
+        let wp = mk("foo");
+        assert wp.filetype() == None;
+    }
+
 }

branches/incoming/src/libsyntax/parse.rs

@@ -51,9 +51,9 @@ fn new_parse_sess_special_handler(sh: span_handler, cm: codemap::codemap)
 
 fn parse_crate_from_file(input: &Path, cfg: ast::crate_cfg,
                          sess: parse_sess) -> @ast::crate {
-    if input.filetype() == Some(~"rc") {
+    if input.filetype() == Some(~".rc") {
         parse_crate_from_crate_file(input, cfg, sess)
-    } else if input.filetype() == Some(~"rs") {
+    } else if input.filetype() == Some(~".rs") {
         parse_crate_from_source_file(input, cfg, sess)
     } else {
         sess.span_diagnostic.handler().fatal(~"unknown input file type: " +

branches/incoming/src/rustc/back/linkage.rs

@@ -685,7 +685,7 @@ fn link_binary(sess: session,
 
     let cstore = sess.cstore;
     for cstore::get_used_crate_files(cstore).each |cratepath| {
-        if cratepath.filetype() == Some(~"rlib") {
+        if cratepath.filetype() == Some(~".rlib") {
             vec::push(cc_args, cratepath.to_str());
             loop;
         }