nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7383

Browse Source 
7383: Add test for path resolution bug r=jonas-schievink a=jonas-schievink

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-01-21 19:36:08 +00:00 committed by GitHub
commit 585816c166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crates/hir_def/src/body/tests.rs
View File

@ -6,18 +6,24 @@ use crate::{test_db::TestDB, ModuleDefId};
use super::*; use super::*;
fn lower(ra_fixture: &str) -> Arc<Body> { fn lower(ra_fixture: &str) -> Arc<Body> {
let (db, file_id) = crate::test_db::TestDB::with_single_file(ra_fixture); let db = crate::test_db::TestDB::with_files(ra_fixture);
let krate = db.crate_graph().iter().next().unwrap(); let krate = db.crate_graph().iter().next().unwrap();
let def_map = db.crate_def_map(krate); let def_map = db.crate_def_map(krate);
let module = def_map.modules_for_file(file_id).next().unwrap(); let mut fn_def = None;
let module = &def_map[module]; 'outer: for (_, module) in def_map.modules() {
let fn_def = match module.scope.declarations().next().unwrap() { for decl in module.scope.declarations() {
ModuleDefId::FunctionId(it) => it, match decl {
_ => panic!(), ModuleDefId::FunctionId(it) => {
}; fn_def = Some(it);
break 'outer;
}
_ => {}
}
}
}
db.body(fn_def.into()) db.body(fn_def.unwrap().into())
} }
fn check_diagnostics(ra_fixture: &str) { fn check_diagnostics(ra_fixture: &str) {
@ -41,6 +47,25 @@ fn main() { n_nuple!(1,2,3); }
); );
} }
#[test]
fn macro_resolve() {
// Regression test for a path resolution bug introduced with inner item handling.
lower(
r"
macro_rules! vec {
() => { () };
($elem:expr; $n:expr) => { () };
($($x:expr),+ $(,)?) => { () };
}
mod m {
fn outer() {
let _ = vec![FileSet::default(); self.len()];
}
}
",
);
}
#[test] #[test]
fn cfg_diagnostics() { fn cfg_diagnostics() {
check_diagnostics( check_diagnostics(