From 27b362b05910c81fd5b28f6cd5d2c075311032f9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 27 Nov 2019 21:44:38 +0300
Subject: [PATCH] Reformat
---
crates/ra_hir/src/from_source.rs | 11 +++++------
crates/ra_hir_def/src/nameres/collector.rs | 3 +--
crates/ra_ide/src/syntax_highlighting.rs | 3 +--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs
index 7756ca80e7e..9f7c22b2118 100644
--- a/crates/ra_hir/src/from_source.rs
+++ b/crates/ra_hir/src/from_source.rs
@@ -262,12 +262,11 @@ impl Module {
let original_file = src.file_id.original_file(db);
- let (krate, local_id) =
- db.relevant_crates(original_file).iter().find_map(|&crate_id| {
- let crate_def_map = db.crate_def_map(crate_id);
- let local_id = crate_def_map.modules_for_file(original_file).next()?;
- Some((crate_id, local_id))
- })?;
+ let (krate, local_id) = db.relevant_crates(original_file).iter().find_map(|&crate_id| {
+ let crate_def_map = db.crate_def_map(crate_id);
+ let local_id = crate_def_map.modules_for_file(original_file).next()?;
+ Some((crate_id, local_id))
+ })?;
Some(Module { id: ModuleId { krate, local_id } })
}
}
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 6cd14026bc8..603b497380a 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -682,8 +682,7 @@ where
}
fn define_def(&mut self, def: &raw::DefData) {
- let module =
- ModuleId { krate: self.def_collector.def_map.krate, local_id: self.module_id };
+ let module = ModuleId { krate: self.def_collector.def_map.krate, local_id: self.module_id };
let ctx = LocationCtx::new(self.def_collector.db, module, self.file_id);
let name = def.name.clone();
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 2c568a747e8..9a3e4c82f65 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -332,8 +332,7 @@ fn bar() {
"#
.trim(),
);
- let dst_file =
- project_dir().join("crates/ra_ide/src/snapshots/rainbow_highlighting.html");
+ let dst_file = project_dir().join("crates/ra_ide/src/snapshots/rainbow_highlighting.html");
let actual_html = &analysis.highlight_as_html(file_id, true).unwrap();
let expected_html = &read_text(&dst_file);
std::fs::write(dst_file, &actual_html).unwrap();