From dac88fa7e6b9ca14d352981183073e0f8d7d96ae Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 19 Dec 2012 14:17:53 -0800
Subject: Remove transitional path2 attribute

---
 src/libsyntax/parse/parser.rs | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'src/libsyntax/parse/parser.rs')

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 8622222e49b..2b83404e065 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/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,
-- 
cgit 1.4.1-3-g733a5