diff options
| author | GuillaumeGomez <guillaume1.gomez@gmail.com> | 2015-02-03 23:31:06 +0100 |
|---|---|---|
| committer | GuillaumeGomez <guillaume1.gomez@gmail.com> | 2015-02-06 11:59:10 +0100 |
| commit | 8b12d3ddf981e5450d8159b29db6ee2197064c8a (patch) | |
| tree | b15555d7f66257a4a2dbd58aa6e14db9a3521f61 /src/libsyntax/parse/parser.rs | |
| parent | 12f1f4c5467b0f4cbdb66c67eca7e5227dbb1284 (diff) | |
| download | rust-8b12d3ddf981e5450d8159b29db6ee2197064c8a.tar.gz rust-8b12d3ddf981e5450d8159b29db6ee2197064c8a.zip | |
Libsyntax has been updated
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 3ff51f99307..3107f47de78 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -84,7 +84,6 @@ use std::mem; use std::num::Float; use std::rc::Rc; use std::slice; -use std::ops::Deref; bitflags! { flags Restrictions: u8 { @@ -5134,7 +5133,7 @@ impl<'a> Parser<'a> { outer_attrs, "path") { Some(d) => (dir_path.join(d), true), None => { - let mod_name = mod_string.deref().to_string(); + let mod_name = mod_string.to_string(); 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[]); @@ -5146,7 +5145,7 @@ impl<'a> Parser<'a> { self.span_err(id_sp, "cannot declare a new module at this location"); let this_module = match self.mod_path_stack.last() { - Some(name) => name.deref().to_string(), + Some(name) => name.to_string(), None => self.root_module_name.as_ref().unwrap().clone(), }; self.span_note(id_sp, @@ -5192,7 +5191,7 @@ impl<'a> Parser<'a> { }; self.eval_src_mod_from_path(file_path, owns_directory, - mod_string.deref().to_string(), id_sp) + mod_string.to_string(), id_sp) } fn eval_src_mod_from_path(&mut self, |
