new lint: [`or_else_then_unwrap`] #15734

illicitonion · 2025-09-22T17:54:55Z

changelog: [or_else_then_unwrap]: New lint. This is the same as or_then_unwrap but for or_else calls with a closure immediately calling Some.

rustbot · 2025-09-22T17:55:00Z

r? @llogiq

rustbot has assigned @llogiq.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

clippy_lints/src/methods/or_else_then_unwrap.rs

ada4a

Looking pretty good:) Left some minor comments

View changes since this review

clippy_lints/src/methods/or_else_then_unwrap.rs

tests/ui/or_else_then_unwrap.rs

tests/ui/or_else_then_unwrap.stderr

tests/ui/or_else_then_unwrap.rs

clippy_lints/src/methods/or_else_then_unwrap.rs

ada4a · 2025-10-10T22:07:44Z

clippy_lints/src/methods/or_else_then_unwrap.rs

+}
+
+fn get_content_if_ctor_matches_in_closure(cx: &LateContext<'_>, expr: &Expr<'_>, item: LangItem) -> Option<Span> {
+    if let ExprKind::Closure(closure) = expr.kind


No idea how likely this is, but you could add a check for the Ok/Some coming from a macro expansion -- e.g., the user can't really do anything about a case like:

fn main() { macro_rules! some { () => { Some(5) } }; None.or_else(|| some!()).unwrap();

See this section for more info: https://doc.rust-lang.org/clippy/development/macro_expansions.html#spanctxt-method

I put in a test case for this with proc_macros::external!{ and it doesn't appear to be triggering the lint without adding in_external_macro check... I'd like to understand why that is before adding the code to intentionally avoid - any idea why this would be getting ignored already? Is that test the right approach, or is there e.g. something special to know about proc_macros::external?

Ah, right, that's because methods/mod.rs mostly filters out any method calls coming from an expansion:

rust-clippy/clippy_lints/src/methods/mod.rs

Lines 4970 to 4972 in 95dd88d

fn check_methods<'tcx>(&self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {

// Handle method calls whose receiver and arguments may not come from expansion

if let Some((name, recv, args, span, call_span)) = method_call(expr) {

rust-clippy/clippy_lints/src/methods/mod.rs

Lines 4852 to 4864 in 95dd88d

/// Extracts a method call name, args, and `Span` of the method name.

/// This ensures that neither the receiver nor any of the arguments

/// come from expansion.

pub fn method_call<'tcx>(recv: &'tcx Expr<'tcx>) -> Option<(Symbol, &'tcx Expr<'tcx>, &'tcx [Expr<'tcx>], Span, Span)> {

if let ExprKind::MethodCall(path, receiver, args, call_span) = recv.kind

&& !args.iter().any(|e| e.span.from_expansion())

&& !receiver.span.from_expansion()

{

Some((path.ident.name, receiver, args, path.ident.span, call_span))

} else {

None

}

}

This might change in the future, but for now, the check I was talking about is indeed unnecessary.

rustbot · 2025-10-19T22:30:57Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

This is the same as or_then_unwrap but for or_else calls with a closure immediately calling `Some`.

Co-authored-by: Ada Alakbarova <[email protected]>

illicitonion · 2025-10-19T22:40:55Z

Thanks so much for the suggestions @ada4a, I really appreciate them!

I do want to call out - I pretty much copied this directly from the or_then_unwrap lint, so all of your suggestions probably apply there too. I'm happy to put together a PR updating that when we're happy with this one too. I did originally look for ways to try to share code between the two, but it felt like that would be more complicated than it was worth, but I'm happy to take another look if you'd prefer (particularly if you have any suggestions for how to make that work well!) :)

ada4a · 2025-10-20T13:48:51Z

Glad to have helped @illicitonion :)

I took a look at or_then_unwrap -- I think you're right unifying the logic wouldn't be worth it. And yes, a PR applying the suggestions to that lint as well would be very welcome:)

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Sep 22, 2025

rustbot assigned llogiq Sep 22, 2025

illicitonion force-pushed the or-else-then-unwrap branch 4 times, most recently from 8307906 to 8f7cade Compare September 22, 2025 20:19

ada4a reviewed Sep 23, 2025

View reviewed changes

clippy_lints/src/methods/or_else_then_unwrap.rs Outdated Show resolved Hide resolved

ada4a reviewed Oct 10, 2025

View reviewed changes

samueltardieu added the needs-fcp label Oct 17, 2025

This comment has been minimized.

Sign in to view

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Oct 19, 2025

illicitonion and others added 10 commits October 19, 2025 23:31

Add or_else_then_unwrap

35f25be

This is the same as or_then_unwrap but for or_else calls with a closure immediately calling `Some`.

Collapse nested ifs

6c280d2

Co-authored-by: Ada Alakbarova <[email protected]>

Switch to let-chain

c69f2eb

Co-authored-by: Ada Alakbarova <[email protected]>

Make comment more concise

0275d74

Co-authored-by: Ada Alakbarova <[email protected]>

Fix function name

b8bcd8d

Co-authored-by: Ada Alakbarova <[email protected]>

Improve naming

5a9e173

Co-authored-by: Ada Alakbarova <[email protected]>

Make suggestion verbose

48f6cd4

Add example macro call

5dd81d7

fmt

c90a482

Update calls since merge

0f37275

illicitonion force-pushed the or-else-then-unwrap branch from e5d9c71 to 0f37275 Compare October 19, 2025 22:31

rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Oct 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

new lint: [`or_else_then_unwrap`] #15734

new lint: [`or_else_then_unwrap`] #15734

Uh oh!

illicitonion commented Sep 22, 2025

Uh oh!

rustbot commented Sep 22, 2025

Uh oh!

Uh oh!

ada4a left a comment •

edited by rustbot

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ada4a Oct 10, 2025

Uh oh!

illicitonion Oct 19, 2025

Uh oh!

ada4a Oct 20, 2025

Uh oh!

rustbot commented Oct 19, 2025

Uh oh!

This comment has been minimized.

illicitonion commented Oct 19, 2025

Uh oh!

ada4a commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	fn check_methods<'tcx>(&self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
	// Handle method calls whose receiver and arguments may not come from expansion
	if let Some((name, recv, args, span, call_span)) = method_call(expr) {

	/// Extracts a method call name, args, and `Span` of the method name.
	/// This ensures that neither the receiver nor any of the arguments
	/// come from expansion.
	pub fn method_call<'tcx>(recv: &'tcx Expr<'tcx>) -> Option<(Symbol, &'tcx Expr<'tcx>, &'tcx [Expr<'tcx>], Span, Span)> {
	if let ExprKind::MethodCall(path, receiver, args, call_span) = recv.kind
	&& !args.iter().any(\|e\| e.span.from_expansion())
	&& !receiver.span.from_expansion()
	{
	Some((path.ident.name, receiver, args, path.ident.span, call_span))
	} else {
	None
	}
	}

new lint: [or_else_then_unwrap] #15734

Are you sure you want to change the base?

new lint: [or_else_then_unwrap] #15734

Uh oh!

Conversation

illicitonion commented Sep 22, 2025

Uh oh!

rustbot commented Sep 22, 2025

Uh oh!

Uh oh!

ada4a left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ada4a Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

illicitonion Oct 19, 2025

Choose a reason for hiding this comment

Uh oh!

ada4a Oct 20, 2025

Choose a reason for hiding this comment

Uh oh!

rustbot commented Oct 19, 2025

Uh oh!

This comment has been minimized.

illicitonion commented Oct 19, 2025

Uh oh!

ada4a commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

new lint: [`or_else_then_unwrap`] #15734

new lint: [`or_else_then_unwrap`] #15734

ada4a left a comment •

edited by rustbot

Loading