Make the path and path2 attributes equivalent. Remove some uses

7 files changed, 13 insertions, 86 deletions

diff --git a/src/librustc/rustc.rc b/src/librustc/rustc.rc
index c934b09a7c4..ae37c160cba 100644
--- a/src/librustc/rustc.rc
+++ b/src/librustc/rustc.rc
@@ -53,174 +53,121 @@ mod middle {
     mod trans {
         #[legacy_exports];
         #[legacy_exports]
-        #[path = "middle/trans/inline.rs"]
         mod inline;
         #[legacy_exports]
-        #[path = "middle/trans/monomorphize.rs"]
         mod monomorphize;
         #[legacy_exports]
-        #[path = "middle/trans/controlflow.rs"]
         mod controlflow;
         #[legacy_exports]
-        #[path = "middle/trans/glue.rs"]
         mod glue;
         #[legacy_exports]
-        #[path = "middle/trans/datum.rs"]
         mod datum;
         #[legacy_exports]
-        #[path = "middle/trans/callee.rs"]
         mod callee;
         #[legacy_exports]
-        #[path = "middle/trans/expr.rs"]
         mod expr;
         #[legacy_exports]
-        #[path = "middle/trans/common.rs"]
         mod common;
         #[legacy_exports]
-        #[path = "middle/trans/consts.rs"]
         mod consts;
         #[legacy_exports]
-        #[path = "middle/trans/type_of.rs"]
         mod type_of;
         #[legacy_exports]
-        #[path = "middle/trans/build.rs"]
         mod build;
         #[legacy_exports]
-        #[path = "middle/trans/base.rs"]
         mod base;
         #[legacy_exports]
-        #[path = "middle/trans/alt.rs"]
         mod alt;
         #[legacy_exports]
-        #[path = "middle/trans/uniq.rs"]
         mod uniq;
         #[legacy_exports]
-        #[path = "middle/trans/closure.rs"]
         mod closure;
         #[legacy_exports]
-        #[path = "middle/trans/tvec.rs"]
         mod tvec;
         #[legacy_exports]
-        #[path = "middle/trans/meth.rs"]
         mod meth;
         #[legacy_exports]
-        #[path = "middle/trans/foreign.rs"]
         mod foreign;
         #[legacy_exports]
-        #[path = "middle/trans/reflect.rs"]
         mod reflect;
         #[legacy_exports]
-        #[path = "middle/trans/shape.rs"]
         mod shape;
         #[legacy_exports]
-        #[path = "middle/trans/debuginfo.rs"]
         mod debuginfo;
         #[legacy_exports]
-        #[path = "middle/trans/type_use.rs"]
         mod type_use;
         #[legacy_exports]
-        #[path = "middle/trans/reachable.rs"]
         mod reachable;
-        #[path = "middle/trans/machine.rs"]
         mod machine;
     }
     #[legacy_exports]
-    #[path = "middle/ty.rs"]
     mod ty;
     #[legacy_exports]
-    #[path = "middle/resolve.rs"]
     mod resolve;
-    #[path = "middle/typeck/mod.rs"]
+    #[path2 = "typeck/mod.rs"]
     pub mod typeck;
     #[legacy_exports]
-    #[path = "middle/check_loop.rs"]
     mod check_loop;
     #[legacy_exports]
-    #[path = "middle/check_alt.rs"]
     mod check_alt;
     #[legacy_exports]
-    #[path = "middle/check_const.rs"]
     mod check_const;
     #[legacy_exports]
-    #[path = "middle/lint.rs"]
     mod lint;
-    #[path = "middle/borrowck/mod.rs"]
+    #[path2 = "borrowck/mod.rs"]
     pub mod borrowck;
     #[legacy_exports]
-    #[path = "middle/mem_categorization.rs"]
     mod mem_categorization;
     #[legacy_exports]
-    #[path = "middle/liveness.rs"]
     mod liveness;
     #[legacy_exports]
-    #[path = "middle/kind.rs"]
     mod kind;
     #[legacy_exports]
-    #[path = "middle/freevars.rs"]
     mod freevars;
     #[legacy_exports]
-    #[path = "middle/capture.rs"]
     mod capture;
     #[legacy_exports]
-    #[path = "middle/pat_util.rs"]
     mod pat_util;
     #[legacy_exports]
-    #[path = "middle/region.rs"]
     mod region;
     #[legacy_exports]
-    #[path = "middle/const_eval.rs"]
     mod const_eval;
     #[legacy_exports]
-    #[path = "middle/astencode.rs"]
     mod astencode;
     #[legacy_exports]
-    #[path = "middle/lang_items.rs"]
     mod lang_items;
     #[legacy_exports]
-    #[path = "middle/privacy.rs"]
     mod privacy;
-    #[path = "middle/mode.rs"]
     mod mode;
 }
 
 mod front {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "front/config.rs"]
     mod config;
     #[legacy_exports]
-    #[path = "front/test.rs"]
     mod test;
     #[legacy_exports]
-    #[path = "front/core_inject.rs"]
     mod core_inject;
     #[legacy_exports]
-    #[path = "front/intrinsic_inject.rs"]
     mod intrinsic_inject;
 }
 
 mod back {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "back/link.rs"]
     mod link;
     #[legacy_exports]
-    #[path = "back/abi.rs"]
     mod abi;
     #[legacy_exports]
-    #[path = "back/upcall.rs"]
     mod upcall;
     #[legacy_exports]
-    #[path = "back/x86.rs"]
     mod x86;
     #[legacy_exports]
-    #[path = "back/x86_64.rs"]
     mod x86_64;
     #[legacy_exports]
-    #[path = "back/rpath.rs"]
     mod rpath;
     #[legacy_exports]
-    #[path = "back/target_strs.rs"]
     mod target_strs;
 }
 
@@ -233,17 +180,14 @@ mod driver;
 mod util {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "util/common.rs"]
     mod common;
     #[legacy_exports]
-    #[path = "util/ppaux.rs"]
     mod ppaux;
 }
 
 mod lib {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "lib/llvm.rs"]
     mod llvm;
 }
 
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 50ed0df28a0..d5aec079d16 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3018,7 +3018,7 @@ impl Parser {
     fn push_mod_path(id: ident, attrs: ~[ast::attribute]) {
         let default_path = self.sess.interner.get(id);
         let file_path = match ::attr::first_attr_value_str_by_name(
-            attrs, ~"path2") {
+            attrs, ~"path") {
 
             Some(ref d) => (*d),
             None => copy *default_path
@@ -3038,13 +3038,14 @@ 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) => Path(*d),
+                Some(ref d) => mod_path.push(*d),
                 None => mod_path.push(default_path)
             }
         };
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc
index 6013178c5ee..50dcf5de63d 100644
--- a/src/libsyntax/syntax.rc
+++ b/src/libsyntax/syntax.rc
@@ -55,7 +55,7 @@ mod fold;
 mod util {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "util/interner.rs"]
+    #[path2 = "interner.rs"]
     mod interner;
 }
 
@@ -65,72 +65,54 @@ mod parse;
 mod print {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "print/pp.rs"]
     mod pp;
     #[legacy_exports]
-    #[path = "print/pprust.rs"]
     mod pprust;
 }
 
 mod ext {
     #[legacy_exports];
     #[legacy_exports]
-    #[path = "ext/base.rs"]
     mod base;
     #[legacy_exports]
-    #[path = "ext/expand.rs"]
     mod expand;
 
-    #[path = "ext/quote.rs"]
     mod quote;
-    #[path = "ext/deriving.rs"]
     mod deriving;
 
     #[legacy_exports]
-    #[path = "ext/build.rs"]
     mod build;
 
     mod tt {
         #[legacy_exports];
         #[legacy_exports]
-        #[path = "ext/tt/transcribe.rs"]
         mod transcribe;
         #[legacy_exports]
-        #[path = "ext/tt/macro_parser.rs"]
         mod macro_parser;
         #[legacy_exports]
-        #[path = "ext/tt/macro_rules.rs"]
         mod macro_rules;
     }
 
 
     #[legacy_exports]
-    #[path = "ext/fmt.rs"]
     mod fmt;
     #[legacy_exports]
-    #[path = "ext/env.rs"]
     mod env;
     #[legacy_exports]
-    #[path = "ext/concat_idents.rs"]
     mod concat_idents;
     #[legacy_exports]
-    #[path = "ext/log_syntax.rs"]
     mod log_syntax;
     #[legacy_exports]
-    #[path = "ext/auto_encode.rs"]
     mod auto_encode;
     #[legacy_exports]
-    #[path = "ext/auto_serialize.rs"]
     mod auto_serialize;
     #[legacy_exports]
-    #[path = "ext/source_util.rs"]
     mod source_util;
 
     #[legacy_exports]
-    #[path = "ext/pipes/mod.rs"]
+    #[path2 = "pipes/mod.rs"]
     mod pipes;
 
     #[legacy_exports]
-    #[path = "ext/trace_macros.rs"]
     mod trace_macros;
 }
diff --git a/src/test/run-pass/mod_dir_path.rs b/src/test/run-pass/mod_dir_path.rs
index 14ad18cd091..dd422ecda85 100644
--- a/src/test/run-pass/mod_dir_path.rs
+++ b/src/test/run-pass/mod_dir_path.rs
@@ -12,7 +12,7 @@
 // xfail-fast
 
 mod mod_dir_simple {
-    #[path2 = "test.rs"]
+    #[path = "test.rs"]
     pub mod syrup;
 }
 
diff --git a/src/test/run-pass/mod_dir_path2.rs b/src/test/run-pass/mod_dir_path2.rs
index 98ed84ec707..a47ff1153ea 100644
--- a/src/test/run-pass/mod_dir_path2.rs
+++ b/src/test/run-pass/mod_dir_path2.rs
@@ -11,9 +11,9 @@
 // xfail-pretty
 // xfail-fast
 
-#[path2 = "mod_dir_simple"]
+#[path = "mod_dir_simple"]
 mod pancakes {
-    #[path2 = "test.rs"]
+    #[path = "test.rs"]
     pub mod syrup;
 }
 
diff --git a/src/test/run-pass/mod_dir_path3.rs b/src/test/run-pass/mod_dir_path3.rs
index cc11dbe1fbd..64e3a9e8277 100644
--- a/src/test/run-pass/mod_dir_path3.rs
+++ b/src/test/run-pass/mod_dir_path3.rs
@@ -11,7 +11,7 @@
 // xfail-pretty
 // xfail-fast
 
-#[path2 = "mod_dir_simple"]
+#[path = "mod_dir_simple"]
 mod pancakes {
     pub mod test;
 }
diff --git a/src/test/run-pass/mod_dir_path_multi.rs b/src/test/run-pass/mod_dir_path_multi.rs
index ef6b3be6e45..6a50d479e06 100644
--- a/src/test/run-pass/mod_dir_path_multi.rs
+++ b/src/test/run-pass/mod_dir_path_multi.rs
@@ -11,12 +11,12 @@
 // xfail-pretty
 // xfail-fast
 
-#[path2 = "mod_dir_simple"]
+#[path = "mod_dir_simple"]
 mod biscuits {
     pub mod test;
 }
 
-#[path2 = "mod_dir_simple"]
+#[path = "mod_dir_simple"]
 mod gravy {
     pub mod test;
 }