diff options
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 5 |
1 files changed, 3 insertions, 2 deletions
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) } }; |