-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Add lint for unnecessary lifetime bounded &str return #13395
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,158 @@ | ||
use clippy_utils::diagnostics::span_lint_and_sugg; | ||
use clippy_utils::path_res; | ||
use rustc_ast::ast::LitKind; | ||
use rustc_errors::Applicability; | ||
use rustc_hir::def::Res; | ||
use rustc_hir::intravisit::{FnKind, Visitor}; | ||
use rustc_hir::{Body, Expr, ExprKind, FnDecl, FnRetTy, Lit, MutTy, Mutability, PrimTy, Ty, TyKind, intravisit}; | ||
use rustc_lint::{LateContext, LateLintPass}; | ||
use rustc_session::declare_lint_pass; | ||
use rustc_span::Span; | ||
use rustc_span::def_id::LocalDefId; | ||
|
||
declare_clippy_lint! { | ||
/// ### What it does | ||
/// | ||
/// Detects functions that are written to return `&str` that could return `&'static str` but instead return a `&'a str`. | ||
/// | ||
/// ### Why is this bad? | ||
/// | ||
/// This leaves the caller unable to use the `&str` as `&'static str`, causing unneccessary allocations or confusion. | ||
/// This is also most likely what you meant to write. | ||
/// | ||
/// ### Example | ||
/// ```no_run | ||
/// # struct MyType; | ||
/// impl MyType { | ||
/// fn returns_literal(&self) -> &str { | ||
/// "Literal" | ||
/// } | ||
/// } | ||
/// ``` | ||
/// Use instead: | ||
/// ```no_run | ||
/// # struct MyType; | ||
/// impl MyType { | ||
/// fn returns_literal(&self) -> &'static str { | ||
/// "Literal" | ||
/// } | ||
/// } | ||
/// ``` | ||
/// Or, in case you may return a non-literal `str` in future: | ||
/// ```no_run | ||
/// # struct MyType; | ||
/// impl MyType { | ||
/// fn returns_literal<'a>(&'a self) -> &'a str { | ||
/// "Literal" | ||
/// } | ||
/// } | ||
/// ``` | ||
#[clippy::version = "1.83.0"] | ||
pub UNNECESSARY_LITERAL_BOUND, | ||
pedantic, | ||
"detects &str that could be &'static str in function return types" | ||
} | ||
|
||
declare_lint_pass!(UnnecessaryLiteralBound => [UNNECESSARY_LITERAL_BOUND]); | ||
|
||
fn extract_anonymous_ref<'tcx>(hir_ty: &Ty<'tcx>) -> Option<&'tcx Ty<'tcx>> { | ||
let TyKind::Ref(lifetime, MutTy { ty, mutbl }) = hir_ty.kind else { | ||
return None; | ||
}; | ||
|
||
if !lifetime.is_anonymous() || !matches!(mutbl, Mutability::Not) { | ||
return None; | ||
} | ||
|
||
Some(ty) | ||
} | ||
|
||
fn is_str_literal(expr: &Expr<'_>) -> bool { | ||
matches!( | ||
expr.kind, | ||
ExprKind::Lit(Lit { | ||
node: LitKind::Str(..), | ||
.. | ||
}), | ||
) | ||
} | ||
|
||
struct FindNonLiteralReturn; | ||
|
||
impl<'hir> Visitor<'hir> for FindNonLiteralReturn { | ||
type Result = std::ops::ControlFlow<()>; | ||
type NestedFilter = intravisit::nested_filter::None; | ||
|
||
fn visit_expr(&mut self, expr: &'hir Expr<'hir>) -> Self::Result { | ||
if let ExprKind::Ret(Some(ret_val_expr)) = expr.kind | ||
&& !is_str_literal(ret_val_expr) | ||
{ | ||
Self::Result::Break(()) | ||
} else { | ||
intravisit::walk_expr(self, expr) | ||
} | ||
} | ||
} | ||
|
||
fn check_implicit_returns_static_str(body: &Body<'_>) -> bool { | ||
// TODO: Improve this to the same complexity as the Visitor to catch more implicit return cases. | ||
if let ExprKind::Block(block, _) = body.value.kind | ||
&& let Some(implicit_ret) = block.expr | ||
{ | ||
return is_str_literal(implicit_ret); | ||
} | ||
|
||
false | ||
} | ||
|
||
fn check_explicit_returns_static_str(expr: &Expr<'_>) -> bool { | ||
let mut visitor = FindNonLiteralReturn; | ||
visitor.visit_expr(expr).is_continue() | ||
} | ||
|
||
impl<'tcx> LateLintPass<'tcx> for UnnecessaryLiteralBound { | ||
fn check_fn( | ||
&mut self, | ||
cx: &LateContext<'tcx>, | ||
kind: FnKind<'tcx>, | ||
decl: &'tcx FnDecl<'_>, | ||
body: &'tcx Body<'_>, | ||
span: Span, | ||
_: LocalDefId, | ||
) { | ||
if span.from_expansion() { | ||
return; | ||
} | ||
|
||
// Checking closures would be a little silly | ||
if matches!(kind, FnKind::Closure) { | ||
return; | ||
} | ||
|
||
// Check for `-> &str` | ||
let FnRetTy::Return(ret_hir_ty) = decl.output else { | ||
return; | ||
}; | ||
|
||
let Some(inner_hir_ty) = extract_anonymous_ref(ret_hir_ty) else { | ||
return; | ||
}; | ||
|
||
if path_res(cx, inner_hir_ty) != Res::PrimTy(PrimTy::Str) { | ||
return; | ||
} | ||
|
||
// Check for all return statements returning literals | ||
if check_explicit_returns_static_str(body.value) && check_implicit_returns_static_str(body) { | ||
span_lint_and_sugg( | ||
cx, | ||
UNNECESSARY_LITERAL_BOUND, | ||
ret_hir_ty.span, | ||
"returning a `str` unnecessarily tied to the lifetime of arguments", | ||
"try", | ||
"&'static str".into(), // how ironic, a lint about `&'static str` requiring a `String` alloc... | ||
Applicability::MachineApplicable, | ||
); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
#![warn(clippy::unnecessary_literal_bound)] | ||
|
||
struct Struct<'a> { | ||
not_literal: &'a str, | ||
} | ||
|
||
impl Struct<'_> { | ||
// Should warn | ||
fn returns_lit(&self) -> &'static str { | ||
"Hello" | ||
} | ||
|
||
// Should NOT warn | ||
fn returns_non_lit(&self) -> &str { | ||
self.not_literal | ||
} | ||
|
||
// Should warn, does not currently | ||
fn conditionally_returns_lit(&self, cond: bool) -> &str { | ||
if cond { "Literal" } else { "also a literal" } | ||
} | ||
|
||
// Should NOT warn | ||
fn conditionally_returns_non_lit(&self, cond: bool) -> &str { | ||
if cond { "Literal" } else { self.not_literal } | ||
} | ||
|
||
// Should warn | ||
fn contionally_returns_literals_explicit(&self, cond: bool) -> &'static str { | ||
if cond { | ||
return "Literal"; | ||
} | ||
|
||
"also a literal" | ||
} | ||
|
||
// Should NOT warn | ||
fn conditionally_returns_non_lit_explicit(&self, cond: bool) -> &str { | ||
if cond { | ||
return self.not_literal; | ||
} | ||
|
||
"Literal" | ||
} | ||
} | ||
|
||
trait ReturnsStr { | ||
fn trait_method(&self) -> &str; | ||
} | ||
|
||
impl ReturnsStr for u8 { | ||
// Should warn, even though not useful without trait refinement | ||
fn trait_method(&self) -> &'static str { | ||
"Literal" | ||
} | ||
} | ||
|
||
impl ReturnsStr for Struct<'_> { | ||
// Should NOT warn | ||
fn trait_method(&self) -> &str { | ||
self.not_literal | ||
} | ||
} | ||
|
||
fn main() {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
#![warn(clippy::unnecessary_literal_bound)] | ||
|
||
struct Struct<'a> { | ||
not_literal: &'a str, | ||
} | ||
|
||
impl Struct<'_> { | ||
// Should warn | ||
fn returns_lit(&self) -> &str { | ||
"Hello" | ||
} | ||
|
||
// Should NOT warn | ||
fn returns_non_lit(&self) -> &str { | ||
self.not_literal | ||
} | ||
|
||
// Should warn, does not currently | ||
fn conditionally_returns_lit(&self, cond: bool) -> &str { | ||
if cond { "Literal" } else { "also a literal" } | ||
} | ||
|
||
// Should NOT warn | ||
fn conditionally_returns_non_lit(&self, cond: bool) -> &str { | ||
if cond { "Literal" } else { self.not_literal } | ||
} | ||
|
||
// Should warn | ||
fn contionally_returns_literals_explicit(&self, cond: bool) -> &str { | ||
if cond { | ||
return "Literal"; | ||
} | ||
|
||
"also a literal" | ||
} | ||
|
||
// Should NOT warn | ||
fn conditionally_returns_non_lit_explicit(&self, cond: bool) -> &str { | ||
if cond { | ||
return self.not_literal; | ||
} | ||
|
||
"Literal" | ||
} | ||
} | ||
|
||
trait ReturnsStr { | ||
fn trait_method(&self) -> &str; | ||
} | ||
|
||
impl ReturnsStr for u8 { | ||
// Should warn, even though not useful without trait refinement | ||
fn trait_method(&self) -> &str { | ||
"Literal" | ||
} | ||
} | ||
|
||
impl ReturnsStr for Struct<'_> { | ||
// Should NOT warn | ||
fn trait_method(&self) -> &str { | ||
self.not_literal | ||
} | ||
} | ||
|
||
fn main() {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
error: returning a `str` unnecessarily tied to the lifetime of arguments | ||
--> tests/ui/unnecessary_literal_bound.rs:9:30 | ||
| | ||
LL | fn returns_lit(&self) -> &str { | ||
| ^^^^ help: try: `&'static str` | ||
| | ||
= note: `-D clippy::unnecessary-literal-bound` implied by `-D warnings` | ||
= help: to override `-D warnings` add `#[allow(clippy::unnecessary_literal_bound)]` | ||
|
||
error: returning a `str` unnecessarily tied to the lifetime of arguments | ||
--> tests/ui/unnecessary_literal_bound.rs:29:68 | ||
| | ||
LL | fn contionally_returns_literals_explicit(&self, cond: bool) -> &str { | ||
| ^^^^ help: try: `&'static str` | ||
|
||
error: returning a `str` unnecessarily tied to the lifetime of arguments | ||
--> tests/ui/unnecessary_literal_bound.rs:53:31 | ||
| | ||
LL | fn trait_method(&self) -> &str { | ||
| ^^^^ help: try: `&'static str` | ||
|
||
error: aborting due to 3 previous errors | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.