OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove strip prefix

Browse Source
This commit is contained in:
Guillaume Gomez 2017-02-25 17:08:46 +01:00
parent bd880bc6bf
commit b10c04472b
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,6 @@ use symbol::{Symbol, keywords};
use util::ThinVec;
use std::collections::HashSet;
use std::env;
use std::mem;
use std::path::{Path, PathBuf};
use std::rc::Rc;
@ -5367,24 +5366,11 @@ impl<'a> Parser<'a> {
let mut err = self.diagnostic().struct_span_err(id_sp,
"cannot declare a new module at this location");
if id_sp != syntax_pos::DUMMY_SP {
let mut src_path = PathBuf::from(self.sess.codemap().span_to_filename(id_sp));
let src_path = PathBuf::from(self.sess.codemap().span_to_filename(id_sp));
if let Some(stem) = src_path.clone().file_stem() {
let mut dest_path = src_path.clone();
dest_path.set_file_name(stem);
dest_path.push("mod.rs");
if let Ok(cur_dir) = env::current_dir() {
let tmp = if let (Ok(src_path), Ok(dest_path)) =
(Path::new(&src_path).strip_prefix(&cur_dir),
Path::new(&dest_path).strip_prefix(&cur_dir)) {
Some((src_path.to_path_buf(), dest_path.to_path_buf()))
} else {
None
};
if let Some(tmp) = tmp {
src_path = tmp.0;
dest_path = tmp.1;
}
}
err.span_note(id_sp,
&format!("maybe move this module `{}` to its own \
directory via `{}`", src_path.to_string_lossy(),
@ -5401,7 +5387,7 @@ impl<'a> Parser<'a> {
} else {
match paths.result {
Ok(succ) => Ok(succ),
Err(err) => Err(self.span_fatal_err(id_sp, &err.err_msg, &err.help_msg)),
Err(err) => Err(self.span_fatal_err(id_sp, err)),
}
}
}

2
src/test/compile-fail/invalid-module-declaration.rs
View File

@ -11,7 +11,7 @@
// ignore-tidy-linelength
// error-pattern: cannot declare a new module at this location
// error-pattern: maybe move this module `src/test/compile-fail/auxiliary/foo/bar.rs` to its own directory via `src/test/compile-fail/auxiliary/foo/bar/mod.rs`
// error-pattern: maybe move this module
mod auxiliary {
mod foo;