bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

libstd: Remove all uses of ~str from libstd

Browse source
This commit is contained in:
Patrick Walton 2014-05-19 17:23:26 -07:00
parent a9dd903d79
commit 5633d4641f
30 changed files with 238 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libsyntax/parse/parser.rs
View file

@ -4242,8 +4242,8 @@ impl<'a> Parser<'a> {
Some(d) => (dir_path.join(d), true),
None => {
let mod_name = mod_string.get().to_owned();
let default_path_str = mod_name + ".rs";
let secondary_path_str = mod_name + "/mod.rs";
let default_path_str = format!("{}.rs", mod_name);
let secondary_path_str = format!("{}/mod.rs", mod_name);
let default_path = dir_path.join(default_path_str.as_slice());
let secondary_path = dir_path.join(secondary_path_str.as_slice());
let default_exists = default_path.exists();
@ -4310,7 +4310,7 @@ impl<'a> Parser<'a> {
err.push_str(" -> ");
}
err.push_str(path.display().as_maybe_owned().as_slice());
self.span_fatal(id_sp, err.into_owned());
self.span_fatal(id_sp, err.as_slice());
}
None => ()
}