rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make the path and path2 attributes equivalent. Remove some uses

Browse Source
This commit is contained in:
Brian Anderson
2012-12-17 18:06:52 -08:00
parent 5ff99c27d0
commit 33a8f855c2
7 changed files with 13 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsyntax/parse/parser.rs
View File

@@ -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)
}
};