---

yaml
---
r: 38107
b: refs/heads/try
c: dac88fa
h: refs/heads/master
i:
  38105: 8a371c6
  38103: be4e97c
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 78dc226617d18bbdfbe202c79af6ec0575d6186d
+refs/heads/try: dac88fa7e6b9ca14d352981183073e0f8d7d96ae
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/rustc.rc

@@ -104,7 +104,7 @@ mod middle {
     mod ty;
     #[legacy_exports]
     mod resolve;
-    #[path2 = "typeck/mod.rs"]
+    #[path = "typeck/mod.rs"]
     pub mod typeck;
     #[legacy_exports]
     mod check_loop;
@@ -114,7 +114,7 @@ mod middle {
     mod check_const;
     #[legacy_exports]
     mod lint;
-    #[path2 = "borrowck/mod.rs"]
+    #[path = "borrowck/mod.rs"]
     pub mod borrowck;
     #[legacy_exports]
     mod mem_categorization;

branches/try/src/libsyntax/parse/parser.rs

@@ -3038,23 +3038,17 @@ impl Parser {
         let prefix = prefix.dir_path();
         let mod_path = Path(".").push_many(self.mod_path_stack);
         let default_path = self.sess.interner.get(id) + ~".rs";
-        // XXX path2 and path are synonyms. Remove path2 after snapshot
         let file_path = match ::attr::first_attr_value_str_by_name(
-            outer_attrs, ~"path2") {
-
-            Some(ref d) => mod_path.push(*d),
-            None => match ::attr::first_attr_value_str_by_name(
-                outer_attrs, ~"path") {
-                Some(ref d) => {
-                    let path = Path(*d);
-                    if !path.is_absolute {
-                        mod_path.push(*d)
-                    } else {
-                        path
-                    }
+            outer_attrs, ~"path") {
+            Some(ref d) => {
+                let path = Path(*d);
+                if !path.is_absolute {
+                    mod_path.push(*d)
+                } else {
+                    path
                 }
-                None => mod_path.push(default_path)
             }
+            None => mod_path.push(default_path)
         };
 
         self.eval_src_mod_from_path(prefix, file_path,

branches/try/src/libsyntax/syntax.rc

@@ -55,7 +55,7 @@ mod fold;
 mod util {
     #[legacy_exports];
     #[legacy_exports]
-    #[path2 = "interner.rs"]
+    #[path = "interner.rs"]
     mod interner;
 }
 
@@ -110,7 +110,7 @@ mod ext {
     mod source_util;
 
     #[legacy_exports]
-    #[path2 = "pipes/mod.rs"]
+    #[path = "pipes/mod.rs"]
     mod pipes;
 
     #[legacy_exports]