about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorKevin Ballard <kevin@sb.org>2013-10-07 19:16:58 -0700
committerKevin Ballard <kevin@sb.org>2013-10-16 10:26:48 -0700
commitbab7eb20dff32294c65fa28cece552481c40cf0b (patch)
treefc81daee54a1f01c62c792ccbfba362e61d52d76 /src/libsyntax/parse/parser.rs
parentc01a97b7a981fb5ae008be7e06df4bf6a85eba4f (diff)
downloadrust-bab7eb20dff32294c65fa28cece552481c40cf0b.tar.gz
rust-bab7eb20dff32294c65fa28cece552481c40cf0b.zip
path2: Update based on more review feedback
Standardize the is_sep() functions to be the same in both posix and
windows, and re-export from path. Update extra::glob to use this.

Remove the usage of either, as it's going away.

Move the WindowsPath-specific methods out of WindowsPath and make them
top-level functions of path::windows instead. This way you cannot
accidentally write code that will fail to compile on non-windows
architectures without typing ::windows anywhere.

Remove GenericPath::from_c_str() and just impl BytesContainer for
CString instead.

Remove .join_path() and .push_path() and just implement BytesContainer
for Path instead.

Remove FilenameDisplay and add a boolean flag to Display instead.

Remove .each_parent(). It only had one caller, so just inline its
definition there.
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 3e1a008f6ca..c776e5bfd38 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3996,7 +3996,7 @@ impl Parser {
         prefix.pop();
         let mod_path_stack = &*self.mod_path_stack;
         let mod_path = Path::new(".").join_many(*mod_path_stack);
-        let dir_path = prefix.join_path(&mod_path);
+        let dir_path = prefix.join(&mod_path);
         let file_path = match ::attr::first_attr_value_str_by_name(
                 outer_attrs, "path") {
             Some(d) => dir_path.join(d),