mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #1898

Browse source 
1898: Drive by lints r=kjeremy a=kjeremy



Co-authored-by: kjeremy <kjeremy@gmail.com>
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-09-23 18:47:14 +00:00 • committed by GitHub
commit c12a713739
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_assists/src/fill_match_arms.rs
View file

@ -29,7 +29,7 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
ctx.add_action(AssistId("fill_match_arms"), "fill match arms", |edit| {
let variants = variant_list.variants();
let arms = variants.into_iter().filter_map(build_pat).map(|pat| {
let arms = variants.filter_map(build_pat).map(|pat| {
AstBuilder::<ast::MatchArm>::from_pieces(
iter::once(pat),
&AstBuilder::<ast::Expr>::unit(),

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

@ -749,7 +749,7 @@ impl Const {
db.const_data(self)
}
pub fn name(&self, db: &impl HirDatabase) -> Option<Name> {
pub fn name(self, db: &impl HirDatabase) -> Option<Name> {
self.data(db).name().cloned()
}

2
crates/ra_hir/src/from_source.rs
View file

@ -122,7 +122,7 @@ impl FromSource for StructField {
.fields()
.into_iter()
.flat_map(|it| it.iter())
.map(|(id, _)| StructField { parent: variant_def.clone(), id })
.map(|(id, _)| StructField { parent: variant_def, id })
.find(|f| f.source(db) == src)
}
}