Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore cargo-fmt gating

Browse source
This commit is contained in:
Aleksey Kladov 2020-03-13 12:28:13 +01:00
parent 1e19847af3
commit 680182d0a0
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,11 +227,9 @@ impl Module {
Some((name, def))
}
})
.flat_map(|(name, def)|
ScopeDef::all_items(def)
.into_iter()
.map(move |item| (name.clone(), item))
)
.flat_map(|(name, def)| {
ScopeDef::all_items(def).into_iter().map(move |item| (name.clone(), item))
})
.collect()
}
@ -1298,10 +1296,8 @@ impl ScopeDef {
let mut items = ArrayVec::new();
match (def.take_types(), def.take_values()) {
(Some(m1), None) =>
items.push(ScopeDef::ModuleDef(m1.into())),
(None, Some(m2)) =>
items.push(ScopeDef::ModuleDef(m2.into())),
(Some(m1), None) => items.push(ScopeDef::ModuleDef(m1.into())),
(None, Some(m2)) => items.push(ScopeDef::ModuleDef(m2.into())),
(Some(m1), Some(m2)) => {
// Some items, like unit structs and enum variants, are
// returned as both a type and a value. Here we want
@ -1312,8 +1308,8 @@ impl ScopeDef {
} else {
items.push(ScopeDef::ModuleDef(m1.into()));
}
},
(None, None) => {},
}
(None, None) => {}
};
if let Some(macro_def_id) = def.take_macros() {

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

@ -349,8 +349,8 @@ impl<'a, DB: HirDatabase> SemanticsScope<'a, DB> {
for item in items {
f(name.clone(), item);
}
return
},
return;
}
resolver::ScopeDef::ImplSelfType(it) => ScopeDef::ImplSelfType(it.into()),
resolver::ScopeDef::AdtSelfType(it) => ScopeDef::AdtSelfType(it.into()),
resolver::ScopeDef::GenericParam(id) => ScopeDef::GenericParam(TypeParam { id }),

1
crates/ra_ide/src/completion/complete_path.rs
View file

@ -1005,5 +1005,4 @@ mod tests {
"###
);
}
}

8
xtask/src/lib.rs
View file

@ -38,13 +38,11 @@ pub fn project_root() -> PathBuf {
}
pub fn run_rustfmt(mode: Mode) -> Result<()> {
let _dir = pushd(project_root());
ensure_rustfmt()?;
if mode == Mode::Verify {
run!("rustup run {} -- cargo fmt -- --check", TOOLCHAIN)?;
} else {
run!("rustup run {} -- cargo fmt", TOOLCHAIN)?;
}
let check = if mode == Mode::Verify { "--check" } else { "" };
run!("rustup run {} -- cargo fmt -- {}", TOOLCHAIN, check)?;
Ok(())
}