Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 23:24:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert nightly rustfmt formatting that accidentally slipped in

Browse source 
cf. https://github.com/rust-lang/rust/pull/99603
cf. https://github.com/rust-lang/rust-analyzer/pull/12871#discussion_r928816339
This commit is contained in:
Amos Wenger 2022-07-25 14:18:28 +02:00
parent 0d04e63627
commit dc94050815
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-def/src/import_map.rs
View file

@ -167,7 +167,11 @@ fn collect_import_map(db: &dyn DefDatabase, krate: CrateId) -> ImportMap {
let visible_items = mod_data.scope.entries().filter_map(|(name, per_ns)| { let visible_items = mod_data.scope.entries().filter_map(|(name, per_ns)| {
let per_ns = per_ns.filter_visibility(|vis| vis == Visibility::Public); let per_ns = per_ns.filter_visibility(|vis| vis == Visibility::Public);
if per_ns.is_none() { None } else { Some((name, per_ns)) } if per_ns.is_none() {
None
} else {
Some((name, per_ns))
}
}); });
for (name, per_ns) in visible_items { for (name, per_ns) in visible_items {

6
crates/hir-def/src/nameres.rs
View file

@ -334,7 +334,11 @@ impl DefMap {
pub(crate) fn crate_root(&self, db: &dyn DefDatabase) -> ModuleId { pub(crate) fn crate_root(&self, db: &dyn DefDatabase) -> ModuleId {
self.with_ancestor_maps(db, self.root, &mut |def_map, _module| { self.with_ancestor_maps(db, self.root, &mut |def_map, _module| {
if def_map.block.is_none() { Some(def_map.module_id(def_map.root)) } else { None } if def_map.block.is_none() {
Some(def_map.module_id(def_map.root))
} else {
None
}
}) })
.expect("DefMap chain without root") .expect("DefMap chain without root")
} }

3
crates/proc-macro-test/build.rs
View file

@ -62,8 +62,7 @@ fn main() {
Command::new(toolchain::cargo()) Command::new(toolchain::cargo())
}; };
cmd cmd.current_dir(&staging_dir)
.current_dir(&staging_dir)
.args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"]) .args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
// Explicit override the target directory to avoid using the same one which the parent // Explicit override the target directory to avoid using the same one which the parent
// cargo is using, or we'll deadlock. // cargo is using, or we'll deadlock.