language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #1491

Browse source 
1491: More clippy r=matklad a=kjeremy

A few more clippy changes.

I'm a little unsure of the second commit. It's the trivially_copy_pass_by_ref lint and there are a number of places in the code we could use it if it makes sense.

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-07-05 14:19:12 +00:00
commit ec6f71576a
5 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -240,10 +240,10 @@ impl Module {
}
pub fn path_to_root(self, db: &impl HirDatabase) -> Vec<Module> {
let mut res = vec![self.clone()];
let mut curr = self.clone();
let mut res = vec![self];
let mut curr = self;
while let Some(next) = curr.parent(db) {
res.push(next.clone());
res.push(next);
curr = next
}
res
@ -299,7 +299,7 @@ impl Module {
.collect()
}
fn with_module_id(&self, module_id: CrateModuleId) -> Module {
fn with_module_id(self, module_id: CrateModuleId) -> Module {
Module { module_id, krate: self.krate }
}
}
@ -463,33 +463,33 @@ pub struct EnumVariant {
}
impl EnumVariant {
pub fn module(&self, db: &impl HirDatabase) -> Module {
pub fn module(self, db: &impl HirDatabase) -> Module {
self.parent.module(db)
}
pub fn parent_enum(&self, _db: &impl DefDatabase) -> Enum {
pub fn parent_enum(self, _db: &impl DefDatabase) -> Enum {
self.parent
}
pub fn name(&self, db: &impl DefDatabase) -> Option<Name> {
pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
db.enum_data(self.parent).variants[self.id].name.clone()
}
pub fn fields(&self, db: &impl HirDatabase) -> Vec<StructField> {
pub fn fields(self, db: &impl HirDatabase) -> Vec<StructField> {
self.variant_data(db)
.fields()
.into_iter()
.flat_map(|it| it.iter())
.map(|(id, _)| StructField { parent: (*self).into(), id })
.map(|(id, _)| StructField { parent: self.into(), id })
.collect()
}
pub fn field(&self, db: &impl HirDatabase, name: &Name) -> Option<StructField> {
pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option<StructField> {
self.variant_data(db)
.fields()
.into_iter()
.flat_map(|it| it.iter())
.find(|(_id, data)| data.name == *name)
.map(|(id, _)| StructField { parent: (*self).into(), id })
.map(|(id, _)| StructField { parent: self.into(), id })
}
}
@ -517,11 +517,11 @@ impl DefWithBody {
}
/// Builds a resolver for code inside this item.
pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
match *self {
DefWithBody::Const(ref c) => c.resolver(db),
DefWithBody::Function(ref f) => f.resolver(db),
DefWithBody::Static(ref s) => s.resolver(db),
pub(crate) fn resolver(self, db: &impl HirDatabase) -> Resolver {
match self {
DefWithBody::Const(c) => c.resolver(db),
DefWithBody::Function(f) => f.resolver(db),
DefWithBody::Static(s) => s.resolver(db),
}
}
}