From 40424d4222d4630bc53294d10f1718f2d3d300de Mon Sep 17 00:00:00 2001 From: Alan Du Date: Mon, 3 Jun 2019 10:21:08 -0400 Subject: Fix clippy::identity_conversion --- crates/ra_hir/src/adt.rs | 2 +- crates/ra_hir/src/impl_block.rs | 1 - crates/ra_hir/src/nameres.rs | 2 +- crates/ra_hir/src/nameres/collector.rs | 2 +- crates/ra_hir/src/nameres/raw.rs | 2 +- crates/ra_hir/src/source_binder.rs | 11 ++++------- crates/ra_hir/src/ty/infer.rs | 6 +++--- 7 files changed, 11 insertions(+), 15 deletions(-) (limited to 'crates/ra_hir/src') diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs index 45a12dd4d..38ff1d6f6 100644 --- a/crates/ra_hir/src/adt.rs +++ b/crates/ra_hir/src/adt.rs @@ -36,7 +36,7 @@ impl AdtDef { impl Struct { pub(crate) fn variant_data(&self, db: &impl DefDatabase) -> Arc { - db.struct_data((*self).into()).variant_data.clone() + db.struct_data(*self).variant_data.clone() } } diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs index ba90e67e9..a0d3b33fe 100644 --- a/crates/ra_hir/src/impl_block.rs +++ b/crates/ra_hir/src/impl_block.rs @@ -202,7 +202,6 @@ impl ModuleImplBlocks { }; let (file_id, module_source) = m.module.definition_source(db); - let file_id: HirFileId = file_id.into(); let node = match &module_source { ModuleSource::SourceFile(node) => node.syntax(), ModuleSource::Module(node) => { diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index d649aa820..d822f7d93 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs @@ -468,7 +468,7 @@ impl CrateDefMap { ); return ResolvePathResult::with( - Either::Left(PerNs::types((*s).into())), + Either::Left(PerNs::types(*s)), ReachedFixedPoint::Yes, Some(i), ); diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 693c3fe8e..3bfef799d 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs @@ -556,7 +556,7 @@ where fn define_def(&mut self, def: &raw::DefData) { let module = Module { krate: self.def_collector.def_map.krate, module_id: self.module_id }; - let ctx = LocationCtx::new(self.def_collector.db, module, self.file_id.into()); + let ctx = LocationCtx::new(self.def_collector.db, module, self.file_id); macro_rules! def { ($kind:ident, $ast_id:ident) => { diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs index 21935dbb9..a0afe282c 100644 --- a/crates/ra_hir/src/nameres/raw.rs +++ b/crates/ra_hir/src/nameres/raw.rs @@ -69,7 +69,7 @@ impl RawItems { ) -> (Arc, Arc) { let mut collector = RawItemsCollector { raw_items: RawItems::default(), - source_ast_id_map: db.ast_id_map(file_id.into()), + source_ast_id_map: db.ast_id_map(file_id), source_map: ImportSourceMap::default(), }; if let Some(node) = db.parse_or_expand(file_id) { diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 75ed2de6c..6a5799622 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs @@ -48,8 +48,8 @@ pub fn module_from_declaration( pub fn module_from_position(db: &impl HirDatabase, position: FilePosition) -> Option { let file = db.parse(position.file_id).tree; match find_node_at_offset::(file.syntax(), position.offset) { - Some(m) if !m.has_semi() => module_from_inline(db, position.file_id.into(), m), - _ => module_from_file_id(db, position.file_id.into()), + Some(m) if !m.has_semi() => module_from_inline(db, position.file_id, m), + _ => module_from_file_id(db, position.file_id), } } @@ -72,9 +72,9 @@ pub fn module_from_child_node( child: &SyntaxNode, ) -> Option { if let Some(m) = child.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi()) { - module_from_inline(db, file_id.into(), m) + module_from_inline(db, file_id, m) } else { - module_from_file_id(db, file_id.into()) + module_from_file_id(db, file_id) } } @@ -99,14 +99,12 @@ pub fn struct_from_module( struct_def: &ast::StructDef, ) -> Struct { let (file_id, _) = module.definition_source(db); - let file_id = file_id.into(); let ctx = LocationCtx::new(db, module, file_id); Struct { id: ctx.to_def(struct_def) } } pub fn enum_from_module(db: &impl HirDatabase, module: Module, enum_def: &ast::EnumDef) -> Enum { let (file_id, _) = module.definition_source(db); - let file_id = file_id.into(); let ctx = LocationCtx::new(db, module, file_id); Enum { id: ctx.to_def(enum_def) } } @@ -117,7 +115,6 @@ pub fn trait_from_module( trait_def: &ast::TraitDef, ) -> Trait { let (file_id, _) = module.definition_source(db); - let file_id = file_id.into(); let ctx = LocationCtx::new(db, module, file_id); Trait { id: ctx.to_def(trait_def) } } diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 58cfcd8a2..5edc59f18 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs @@ -539,7 +539,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { } })?; - resolved = Resolution::Def(item.into()); + resolved = Resolution::Def(item); } match resolved { @@ -762,7 +762,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { _ => &Ty::Unknown, }; let subty = self.infer_pat(*pat, expectation, default_bm); - Ty::apply_one(TypeCtor::Ref(*mutability), subty.into()) + Ty::apply_one(TypeCtor::Ref(*mutability), subty) } Pat::TupleStruct { path: ref p, args: ref subpats } => { self.infer_tuple_struct_pat(p.as_ref(), subpats, expected, default_bm) @@ -790,7 +790,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { let bound_ty = match mode { BindingMode::Ref(mutability) => { - Ty::apply_one(TypeCtor::Ref(mutability), inner_ty.clone().into()) + Ty::apply_one(TypeCtor::Ref(mutability), inner_ty.clone()) } BindingMode::Move => inner_ty.clone(), }; -- cgit v1.2.3