From b8ddcb0652f3ec8683023afc1e1f5166d6a712f4 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Tue, 18 Feb 2020 14:53:02 +0200
Subject: Run cargo +nightly fix --clippy -Z unstable-options

---
 crates/ra_hir/src/code_model.rs      | 10 +++++-----
 crates/ra_hir/src/source_analyzer.rs |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'crates/ra_hir')

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index b6adb7589..fe9149c9d 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -283,7 +283,7 @@ impl StructField {
         };
         let substs = Substs::type_params(db, generic_def_id);
         let ty = db.field_types(var_id)[self.id].clone().subst(&substs);
-        Type::new(db, self.parent.module(db).id.krate.into(), var_id, ty)
+        Type::new(db, self.parent.module(db).id.krate, var_id, ty)
     }
 
     pub fn parent_def(&self, _db: &impl HirDatabase) -> VariantDef {
@@ -315,11 +315,11 @@ impl Struct {
     }
 
     pub fn name(self, db: &impl DefDatabase) -> Name {
-        db.struct_data(self.id.into()).name.clone()
+        db.struct_data(self.id).name.clone()
     }
 
     pub fn fields(self, db: &impl HirDatabase) -> Vec<StructField> {
-        db.struct_data(self.id.into())
+        db.struct_data(self.id)
             .variant_data
             .fields()
             .iter()
@@ -332,7 +332,7 @@ impl Struct {
     }
 
     fn variant_data(self, db: &impl DefDatabase) -> Arc<VariantData> {
-        db.struct_data(self.id.into()).variant_data.clone()
+        db.struct_data(self.id).variant_data.clone()
     }
 }
 
@@ -1049,7 +1049,7 @@ impl Type {
         // FIXME check that?
         let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 };
         let environment = self.ty.environment.clone();
-        let ty = InEnvironment { value: canonical, environment: environment.clone() };
+        let ty = InEnvironment { value: canonical, environment };
         autoderef(db, Some(self.krate), ty)
             .map(|canonical| canonical.value)
             .map(move |ty| self.derived(ty))
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 94d5b4cfd..efa3f8a79 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -361,9 +361,8 @@ impl SourceAnalyzer {
         db: &impl HirDatabase,
         macro_call: InFile<&ast::MacroCall>,
     ) -> Option<Expansion> {
-        let macro_call_id = macro_call.as_call_id(db, |path| {
-            self.resolver.resolve_path_as_macro(db, &path).map(|it| it.into())
-        })?;
+        let macro_call_id =
+            macro_call.as_call_id(db, |path| self.resolver.resolve_path_as_macro(db, &path))?;
         Some(Expansion { macro_call_id })
     }
 }
-- 
cgit v1.2.3