nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-13 00:56:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #10109 - Niki4tap:yeet_not_return, r=flip1995

Browse Source 
Fix FP in needless_return when using yeet

Fixes #9947

changelog: Fix: [`needless_return`]: don't lint when using `do yeet`
#10109
This commit is contained in:
bors 2022-12-22 10:40:33 +00:00
commit f0d331ab36
4 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_lints/src/returns.rs
View File

@ -6,7 +6,7 @@ use core::ops::ControlFlow;
use if_chain::if_chain; use if_chain::if_chain;
use rustc_errors::Applicability; use rustc_errors::Applicability;
use rustc_hir::intravisit::FnKind; use rustc_hir::intravisit::FnKind;
use rustc_hir::{Block, Body, Expr, ExprKind, FnDecl, HirId, MatchSource, PatKind, StmtKind}; use rustc_hir::{Block, Body, Expr, ExprKind, FnDecl, HirId, LangItem, MatchSource, PatKind, QPath, StmtKind};
use rustc_lint::{LateContext, LateLintPass, LintContext}; use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::lint::in_external_macro; use rustc_middle::lint::in_external_macro;
use rustc_middle::ty::subst::GenericArgKind; use rustc_middle::ty::subst::GenericArgKind;
@ -207,6 +207,12 @@ fn check_final_expr<'tcx>(
match &peeled_drop_expr.kind { match &peeled_drop_expr.kind {
// simple return is always "bad" // simple return is always "bad"
ExprKind::Ret(ref inner) => { ExprKind::Ret(ref inner) => {
// if desugar of `do yeet`, don't lint
if let Some(inner_expr) = inner
&& let ExprKind::Call(path_expr, _) = inner_expr.kind
&& let ExprKind::Path(QPath::LangItem(LangItem::TryTraitFromYeet, _, _)) = path_expr.kind {
return;
}
if cx.tcx.hir().attrs(expr.hir_id).is_empty() { if cx.tcx.hir().attrs(expr.hir_id).is_empty() {
let borrows = inner.map_or(false, |inner| last_statement_borrows(cx, inner)); let borrows = inner.map_or(false, |inner| last_statement_borrows(cx, inner));
if !borrows { if !borrows {

5
tests/ui/needless_return.fixed
View File

@ -1,6 +1,7 @@
// run-rustfix // run-rustfix
#![feature(lint_reasons)] #![feature(lint_reasons)]
#![feature(yeet_expr)]
#![allow(unused)] #![allow(unused)]
#![allow( #![allow(
clippy::if_same_then_else, clippy::if_same_then_else,
@ -272,4 +273,8 @@ mod issue9416 {
} }
} }
fn issue9947() -> Result<(), String> {
do yeet "hello";
}
fn main() {} fn main() {}

5
tests/ui/needless_return.rs
View File

@ -1,6 +1,7 @@
// run-rustfix // run-rustfix
#![feature(lint_reasons)] #![feature(lint_reasons)]
#![feature(yeet_expr)]
#![allow(unused)] #![allow(unused)]
#![allow( #![allow(
clippy::if_same_then_else, clippy::if_same_then_else,
@ -282,4 +283,8 @@ mod issue9416 {
} }
} }
fn issue9947() -> Result<(), String> {
do yeet "hello";
}
fn main() {} fn main() {}

92
tests/ui/needless_return.stderr
View File

@ -1,5 +1,5 @@
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:26:5 --> $DIR/needless_return.rs:27:5
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -8,7 +8,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:30:5 --> $DIR/needless_return.rs:31:5
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -16,7 +16,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:35:9 --> $DIR/needless_return.rs:36:9
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -24,7 +24,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:37:9 --> $DIR/needless_return.rs:38:9
| |
LL | return false; LL | return false;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -32,7 +32,7 @@ LL | return false;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:43:17 --> $DIR/needless_return.rs:44:17
| |
LL | true => return false, LL | true => return false,
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -40,7 +40,7 @@ LL | true => return false,
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:45:13 --> $DIR/needless_return.rs:46:13
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -48,7 +48,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:52:9 --> $DIR/needless_return.rs:53:9
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -56,7 +56,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:54:16 --> $DIR/needless_return.rs:55:16
| |
LL | let _ = || return true; LL | let _ = || return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -64,7 +64,7 @@ LL | let _ = || return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:58:5 --> $DIR/needless_return.rs:59:5
| |
LL | return the_answer!(); LL | return the_answer!();
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
@ -72,7 +72,7 @@ LL | return the_answer!();
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:61:21 --> $DIR/needless_return.rs:62:21
| |
LL | fn test_void_fun() { LL | fn test_void_fun() {
| _____________________^ | _____________________^
@ -82,7 +82,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:66:11 --> $DIR/needless_return.rs:67:11
| |
LL | if b { LL | if b {
| ___________^ | ___________^
@ -92,7 +92,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:68:13 --> $DIR/needless_return.rs:69:13
| |
LL | } else { LL | } else {
| _____________^ | _____________^
@ -102,7 +102,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:76:14 --> $DIR/needless_return.rs:77:14
| |
LL | _ => return, LL | _ => return,
| ^^^^^^ | ^^^^^^
@ -110,7 +110,7 @@ LL | _ => return,
= help: replace `return` with a unit value = help: replace `return` with a unit value
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:84:24 --> $DIR/needless_return.rs:85:24
| |
LL | let _ = 42; LL | let _ = 42;
| ________________________^ | ________________________^
@ -120,7 +120,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:87:14 --> $DIR/needless_return.rs:88:14
| |
LL | _ => return, LL | _ => return,
| ^^^^^^ | ^^^^^^
@ -128,7 +128,7 @@ LL | _ => return,
= help: replace `return` with a unit value = help: replace `return` with a unit value
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:100:9 --> $DIR/needless_return.rs:101:9
| |
LL | return String::from("test"); LL | return String::from("test");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -136,7 +136,7 @@ LL | return String::from("test");
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:102:9 --> $DIR/needless_return.rs:103:9
| |
LL | return String::new(); LL | return String::new();
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
@ -144,7 +144,7 @@ LL | return String::new();
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:124:32 --> $DIR/needless_return.rs:125:32
| |
LL | bar.unwrap_or_else(|_| return) LL | bar.unwrap_or_else(|_| return)
| ^^^^^^ | ^^^^^^
@ -152,7 +152,7 @@ LL | bar.unwrap_or_else(|_| return)
= help: replace `return` with an empty block = help: replace `return` with an empty block
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:128:21 --> $DIR/needless_return.rs:129:21
| |
LL | let _ = || { LL | let _ = || {
| _____________________^ | _____________________^
@ -162,7 +162,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:131:20 --> $DIR/needless_return.rs:132:20
| |
LL | let _ = || return; LL | let _ = || return;
| ^^^^^^ | ^^^^^^
@ -170,7 +170,7 @@ LL | let _ = || return;
= help: replace `return` with an empty block = help: replace `return` with an empty block
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:137:32 --> $DIR/needless_return.rs:138:32
| |
LL | res.unwrap_or_else(|_| return Foo) LL | res.unwrap_or_else(|_| return Foo)
| ^^^^^^^^^^ | ^^^^^^^^^^
@ -178,7 +178,7 @@ LL | res.unwrap_or_else(|_| return Foo)
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:146:5 --> $DIR/needless_return.rs:147:5
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -186,7 +186,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:150:5 --> $DIR/needless_return.rs:151:5
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -194,7 +194,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:155:9 --> $DIR/needless_return.rs:156:9
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -202,7 +202,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:157:9 --> $DIR/needless_return.rs:158:9
| |
LL | return false; LL | return false;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -210,7 +210,7 @@ LL | return false;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:163:17 --> $DIR/needless_return.rs:164:17
| |
LL | true => return false, LL | true => return false,
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -218,7 +218,7 @@ LL | true => return false,
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:165:13 --> $DIR/needless_return.rs:166:13
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -226,7 +226,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:172:9 --> $DIR/needless_return.rs:173:9
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -234,7 +234,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:174:16 --> $DIR/needless_return.rs:175:16
| |
LL | let _ = || return true; LL | let _ = || return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -242,7 +242,7 @@ LL | let _ = || return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:178:5 --> $DIR/needless_return.rs:179:5
| |
LL | return the_answer!(); LL | return the_answer!();
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
@ -250,7 +250,7 @@ LL | return the_answer!();
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:181:33 --> $DIR/needless_return.rs:182:33
| |
LL | async fn async_test_void_fun() { LL | async fn async_test_void_fun() {
| _________________________________^ | _________________________________^
@ -260,7 +260,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:186:11 --> $DIR/needless_return.rs:187:11
| |
LL | if b { LL | if b {
| ___________^ | ___________^
@ -270,7 +270,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:188:13 --> $DIR/needless_return.rs:189:13
| |
LL | } else { LL | } else {
| _____________^ | _____________^
@ -280,7 +280,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:196:14 --> $DIR/needless_return.rs:197:14
| |
LL | _ => return, LL | _ => return,
| ^^^^^^ | ^^^^^^
@ -288,7 +288,7 @@ LL | _ => return,
= help: replace `return` with a unit value = help: replace `return` with a unit value
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:209:9 --> $DIR/needless_return.rs:210:9
| |
LL | return String::from("test"); LL | return String::from("test");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -296,7 +296,7 @@ LL | return String::from("test");
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:211:9 --> $DIR/needless_return.rs:212:9
| |
LL | return String::new(); LL | return String::new();
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
@ -304,7 +304,7 @@ LL | return String::new();
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:227:5 --> $DIR/needless_return.rs:228:5
| |
LL | return format!("Hello {}", "world!"); LL | return format!("Hello {}", "world!");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -312,7 +312,7 @@ LL | return format!("Hello {}", "world!");
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:238:9 --> $DIR/needless_return.rs:239:9
| |
LL | return true; LL | return true;
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -320,7 +320,7 @@ LL | return true;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:240:9 --> $DIR/needless_return.rs:241:9
| |
LL | return false; LL | return false;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
@ -328,7 +328,7 @@ LL | return false;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:247:13 --> $DIR/needless_return.rs:248:13
| |
LL | return 10; LL | return 10;
| ^^^^^^^^^ | ^^^^^^^^^
@ -336,7 +336,7 @@ LL | return 10;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:250:13 --> $DIR/needless_return.rs:251:13
| |
LL | return 100; LL | return 100;
| ^^^^^^^^^^ | ^^^^^^^^^^
@ -344,7 +344,7 @@ LL | return 100;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:258:9 --> $DIR/needless_return.rs:259:9
| |
LL | return 0; LL | return 0;
| ^^^^^^^^ | ^^^^^^^^
@ -352,7 +352,7 @@ LL | return 0;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:265:13 --> $DIR/needless_return.rs:266:13
| |
LL | return *(x as *const isize); LL | return *(x as *const isize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -360,7 +360,7 @@ LL | return *(x as *const isize);
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:267:13 --> $DIR/needless_return.rs:268:13
| |
LL | return !*(x as *const isize); LL | return !*(x as *const isize);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -368,7 +368,7 @@ LL | return !*(x as *const isize);
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:274:20 --> $DIR/needless_return.rs:275:20
| |
LL | let _ = 42; LL | let _ = 42;
| ____________________^ | ____________________^
@ -379,7 +379,7 @@ LL | | return;
= help: remove `return` = help: remove `return`
error: unneeded `return` statement error: unneeded `return` statement
--> $DIR/needless_return.rs:281:20 --> $DIR/needless_return.rs:282:20
| |
LL | let _ = 42; return; LL | let _ = 42; return;
| ^^^^^^^ | ^^^^^^^