language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #9242

Browse source 
9242: Clippy r=matklad a=Maan2003

Best viewed commit wise

Co-authored-by: Maan2003 <manmeetmann2003@gmail.com>
This commit is contained in:
bors[bot] 2021-06-13 07:18:49 +00:00 • committed by GitHub
commit adbee621a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 372 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ide_assists/src/handlers/extract_function.rs
View file

@ -76,7 +76,7 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
let module = ctx.sema.scope(&insert_after).module()?;
let vars_defined_in_body_and_outlive =
vars_defined_in_body_and_outlive(ctx, &body, &node.parent().as_ref().unwrap_or(&node));
vars_defined_in_body_and_outlive(ctx, &body, node.parent().as_ref().unwrap_or(&node));
let ret_ty = body_return_ty(ctx, &body)?;
// FIXME: we compute variables that outlive here just to check `never!` condition
@ -808,7 +808,7 @@ trait HasTokenAtOffset {
impl HasTokenAtOffset for SyntaxNode {
fn token_at_offset(&self, offset: TextSize) -> TokenAtOffset<SyntaxToken> {
SyntaxNode::token_at_offset(&self, offset)
SyntaxNode::token_at_offset(self, offset)
}
}
@ -854,7 +854,7 @@ fn vars_defined_in_body_and_outlive(
body: &FunctionBody,
parent: &SyntaxNode,
) -> Vec<OutlivedLocal> {
let vars_defined_in_body = vars_defined_in_body(&body, ctx);
let vars_defined_in_body = vars_defined_in_body(body, ctx);
vars_defined_in_body
.into_iter()
.filter_map(|var| var_outlives_body(ctx, body, var, parent))
@ -868,7 +868,7 @@ fn is_defined_before(
src: &hir::InFile<Either<ast::IdentPat, ast::SelfParam>>,
) -> bool {
src.file_id.original_file(ctx.db()) == ctx.frange.file_id
&& !body.contains_node(&either_syntax(&src.value))
&& !body.contains_node(either_syntax(&src.value))
}
fn either_syntax(value: &Either<ast::IdentPat, ast::SelfParam>) -> &SyntaxNode {