Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update expect tests

Browse source
This commit is contained in:
Zac Pullar-Strecker 2020-07-31 14:34:49 +12:00
parent 9522a06fd4
commit 1fa842c8c9
3 changed files with 424 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/code_model.rs
View file

@ -212,9 +212,7 @@ impl ModuleDef {
ModuleDef::EnumVariant(ev) => { ModuleDef::EnumVariant(ev) => {
GenericDefId::from(GenericDef::from(ev.clone())).resolver(db) GenericDefId::from(GenericDef::from(ev.clone())).resolver(db)
} }
ModuleDef::Const(c) => { ModuleDef::Const(c) => GenericDefId::from(GenericDef::from(c.clone())).resolver(db),
GenericDefId::from(GenericDef::from(c.clone())).resolver(db)
}
ModuleDef::Static(s) => StaticId::from(s.clone()).resolver(db), ModuleDef::Static(s) => StaticId::from(s.clone()).resolver(db),
ModuleDef::Trait(t) => TraitId::from(t.clone()).resolver(db), ModuleDef::Trait(t) => TraitId::from(t.clone()).resolver(db),
ModuleDef::TypeAlias(t) => ModuleId::from(t.module(db)).resolver(db), ModuleDef::TypeAlias(t) => ModuleId::from(t.module(db)).resolver(db),

580
crates/ra_ide/src/hover.rs
View file

File diff suppressed because it is too large Load diff

7
xtask/tests/tidy.rs
View file

@ -53,9 +53,11 @@ fn rust_files_are_tidy() {
fn check_licenses() { fn check_licenses() {
let expected = " let expected = "
0BSD OR MIT OR Apache-2.0 0BSD OR MIT OR Apache-2.0
Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
Apache-2.0 OR BSL-1.0 Apache-2.0 OR BSL-1.0
Apache-2.0 OR MIT Apache-2.0 OR MIT
Apache-2.0/MIT Apache-2.0/MIT
Apache-2.0
BSD-2-Clause BSD-2-Clause
BSD-3-Clause BSD-3-Clause
CC0-1.0 CC0-1.0
@ -82,7 +84,10 @@ Zlib
.collect::<Vec<_>>(); .collect::<Vec<_>>();
licenses.sort(); licenses.sort();
licenses.dedup(); licenses.dedup();
assert_eq!(licenses, expected); assert_eq!(
licenses.iter().filter(|license| !expected.contains(license)).collect::<Vec<_>>(),
Vec::<&&str>::new()
);
} }
fn check_todo(path: &Path, text: &str) { fn check_todo(path: &Path, text: &str) {