Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #9927

Browse source 
9927: minor: Fix some clippy lints r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-08-16 19:04:57 +00:00 committed by GitHub
commit 067bae3247
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/source_analyzer.rs
View file

@ -129,7 +129,7 @@ impl SourceAnalyzer {
.and_then(|adjusts| adjusts.last().map(|adjust| adjust.target.clone())); .and_then(|adjusts| adjusts.last().map(|adjust| adjust.target.clone()));
let ty = infer[expr_id].clone(); let ty = infer[expr_id].clone();
let mk_ty = |ty| Type::new_with_resolver(db, &self.resolver, ty); let mk_ty = |ty| Type::new_with_resolver(db, &self.resolver, ty);
mk_ty(ty.clone()).zip(Some(coerced.and_then(mk_ty))) mk_ty(ty).zip(Some(coerced.and_then(mk_ty)))
} }
pub(crate) fn type_of_pat( pub(crate) fn type_of_pat(
@ -145,7 +145,7 @@ impl SourceAnalyzer {
.and_then(|adjusts| adjusts.last().map(|adjust| adjust.target.clone())); .and_then(|adjusts| adjusts.last().map(|adjust| adjust.target.clone()));
let ty = infer[pat_id].clone(); let ty = infer[pat_id].clone();
let mk_ty = |ty| Type::new_with_resolver(db, &self.resolver, ty); let mk_ty = |ty| Type::new_with_resolver(db, &self.resolver, ty);
mk_ty(ty.clone()).zip(Some(coerced.and_then(mk_ty))) mk_ty(ty).zip(Some(coerced.and_then(mk_ty)))
} }
pub(crate) fn type_of_self( pub(crate) fn type_of_self(

2
crates/ide_assists/src/utils.rs
View file

@ -464,7 +464,7 @@ pub(crate) fn add_method_to_adt(
} }
pub fn useless_type_special_case(field_name: &str, field_ty: &String) -> Option<(String, String)> { pub fn useless_type_special_case(field_name: &str, field_ty: &String) -> Option<(String, String)> {
if field_ty.to_string() == "String" { if field_ty == "String" {
cov_mark::hit!(useless_type_special_case); cov_mark::hit!(useless_type_special_case);
return Some(("&str".to_string(), format!("self.{}.as_str()", field_name))); return Some(("&str".to_string(), format!("self.{}.as_str()", field_name)));
} }