diff options
Diffstat (limited to 'src/libsyntax/ext/expand.rs')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 6e7a8203b61..c4727b6eda5 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -35,7 +35,6 @@ use visit::Visitor; use std::collections::HashMap; use std::mem; -use std::path::PathBuf; use std::rc::Rc; macro_rules! expansions { @@ -200,7 +199,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { self.cx.crate_root = std_inject::injected_crate_name(&krate); let mut module = ModuleData { mod_path: vec![Ident::from_str(&self.cx.ecfg.crate_name)], - directory: PathBuf::from(self.cx.codemap().span_to_filename(krate.span)), + directory: self.cx.codemap().span_to_path(krate.span), }; module.directory.pop(); self.cx.current_expansion.module = Rc::new(module); @@ -952,8 +951,7 @@ impl<'a, 'b> Folder for InvocationCollector<'a, 'b> { module.directory.push(&*item.ident.name.as_str()); } } else { - let mut path = - PathBuf::from(self.cx.parse_sess.codemap().span_to_filename(inner)); + let mut path = self.cx.parse_sess.codemap().span_to_path(inner); let directory_ownership = match path.file_name().unwrap().to_str() { Some("mod.rs") => DirectoryOwnership::Owned, _ => DirectoryOwnership::UnownedViaMod(false), |