Suggest clone in user-write-code instead of inside macro by xizheyin · Pull Request #142569 · rust-lang/rust

xizheyin · 2025-06-16T09:52:42Z

Fixes #139253

Inspired by #142543

r? @fmease

rustbot · 2025-06-16T09:52:47Z

fmease is not on the review rotation at the moment.
They may take a while to respond.

fmease

Generally speaking, very much in favor. Thanks for considering this approach!

There still some unknowns I'd like solve, see my comment about struct field shorthands.

tests/ui/typeck/suggestions/suggest-clone-in-macro-issue-139253.rs

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

xizheyin

@rustbot ready

xizheyin · 2025-06-17T15:53:48Z

tests/ui/typeck/suggestions/suggest-clone-in-macro-issue-139253.rs

+#[derive(Debug, Clone)]
+struct Struct { field: S }
+
+#[derive(Debug, Clone)]
+struct S;
+
+macro_rules! expand {
+    ($ident:ident) => { Struct { $ident } }
+}
+
+fn test1() {
+    let field = &S;
+    let a: Struct = dbg!(expand!(field)); //~ ERROR mismatched types [E0308]
+    let b: Struct = dbg!(Struct { field }); //~ ERROR mismatched types [E0308]
+    let c: S = dbg!(field); //~ ERROR mismatched types [E0308]
+    let c: S = dbg!(dbg!(field)); //~ ERROR mismatched types [E0308]
+}
+
+fn main() {}


I updated the test case and as you can see from the diff of the two commits, this has no effect on the shorthand case.

But this is actually strange, for the shorthand case, expr.span doesn't come from macro expansion, is this a bug? maybe fix it in another PR.

xizheyin · 2025-07-15T08:33:57Z

r? compiler

davidtwco

This is an improvement for one case, even if the shorthand fields are still incorrect, that can always be fixed in a follow-up.

davidtwco · 2025-07-24T12:13:16Z

@bors r+ rollup

bors · 2025-07-24T12:13:19Z

📌 Commit fd9c1b9 has been approved by davidtwco

It is now in the queue for this repository.

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? `@fmease`

Rollup of 16 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144225 (Don't special-case llvm.* as nounwind) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144373 (remove deprecated Error::description in impls) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? ``@fmease``

Rollup of 17 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144225 (Don't special-case llvm.* as nounwind) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) - #144424 (Allow setting `release-blog-post` label with rustbot) r? `@ghost` `@rustbot` modify labels: rollup

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? ```@fmease```

Rollup of 16 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) - #144424 (Allow setting `release-blog-post` label with rustbot) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 12 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144314 (Hint that choose_pivot returns index in bounds) - #144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142569 - xizheyin:139253, r=davidtwco Suggest clone in user-write-code instead of inside macro Fixes #139253 Inspired by #142543 r? ````@fmease````

Rollup of 12 pull requests Successful merges: - rust-lang/rust#142569 (Suggest clone in user-write-code instead of inside macro) - rust-lang/rust#143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - rust-lang/rust#143424 (clippy fix: rely on autoderef) - rust-lang/rust#143970 (Update core::mem::copy documentation) - rust-lang/rust#143979 (Test fixes for Arm64EC Windows) - rust-lang/rust#144200 (Tweak output for non-`Clone` values moved into closures) - rust-lang/rust#144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - rust-lang/rust#144314 (Hint that choose_pivot returns index in bounds) - rust-lang/rust#144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - rust-lang/rust#144368 (resolve: Remove `Scope::CrateRoot`) - rust-lang/rust#144390 (Remove dead code and extend test coverage and diagnostics around it) - rust-lang/rust#144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#142569 (Suggest clone in user-write-code instead of inside macro) - rust-lang#143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - rust-lang#143424 (clippy fix: rely on autoderef) - rust-lang#143970 (Update core::mem::copy documentation) - rust-lang#143979 (Test fixes for Arm64EC Windows) - rust-lang#144200 (Tweak output for non-`Clone` values moved into closures) - rust-lang#144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - rust-lang#144314 (Hint that choose_pivot returns index in bounds) - rust-lang#144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - rust-lang#144368 (resolve: Remove `Scope::CrateRoot`) - rust-lang#144390 (Remove dead code and extend test coverage and diagnostics around it) - rust-lang#144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 12 pull requests Successful merges: - rust-lang/rust#142569 (Suggest clone in user-write-code instead of inside macro) - rust-lang/rust#143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - rust-lang/rust#143424 (clippy fix: rely on autoderef) - rust-lang/rust#143970 (Update core::mem::copy documentation) - rust-lang/rust#143979 (Test fixes for Arm64EC Windows) - rust-lang/rust#144200 (Tweak output for non-`Clone` values moved into closures) - rust-lang/rust#144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - rust-lang/rust#144314 (Hint that choose_pivot returns index in bounds) - rust-lang/rust#144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - rust-lang/rust#144368 (resolve: Remove `Scope::CrateRoot`) - rust-lang/rust#144390 (Remove dead code and extend test coverage and diagnostics around it) - rust-lang/rust#144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned fmease Jun 16, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 16, 2025

fmease reviewed Jun 16, 2025

View reviewed changes

tests/ui/typeck/suggestions/suggest-clone-in-macro-issue-139253.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Show resolved Hide resolved

fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 16, 2025

xizheyin force-pushed the 139253 branch from 0786375 to 331019e Compare June 17, 2025 15:30

xizheyin marked this pull request as draft June 17, 2025 15:37

xizheyin added 2 commits June 17, 2025 23:42

add test suggest-clone-in-macro-issue-139253.rs

02dac5c

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

Find correct span when suggesting using clone

fd9c1b9

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

xizheyin force-pushed the 139253 branch from 331019e to fd9c1b9 Compare June 17, 2025 15:49

This comment was marked as duplicate.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 17, 2025

xizheyin commented Jun 17, 2025

View reviewed changes

xizheyin marked this pull request as ready for review June 18, 2025 01:46

rustbot assigned davidtwco and unassigned fmease Jul 15, 2025

davidtwco approved these changes Jul 24, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2025

fmease added a commit to fmease/rust that referenced this pull request Jul 24, 2025

Rollup merge of rust-lang#142569 - xizheyin:139253, r=davidtwco

f73d14c

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? `@fmease`

fmease mentioned this pull request Jul 24, 2025

Rollup of 16 pull requests #144418

Closed

fmease added a commit to fmease/rust that referenced this pull request Jul 25, 2025

Rollup merge of rust-lang#142569 - xizheyin:139253, r=davidtwco

e7f7d9f

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? ``@fmease``

fmease mentioned this pull request Jul 25, 2025

Rollup of 17 pull requests #144428

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 25, 2025

Rollup merge of rust-lang#142569 - xizheyin:139253, r=davidtwco

6ada36a

Suggest clone in user-write-code instead of inside macro Fixes rust-lang#139253 Inspired by rust-lang#142543 r? ```@fmease```

This was referenced Jul 25, 2025

Rollup of 16 pull requests #144436

Closed

Rollup of 12 pull requests #144440

Merged

bors merged commit 2e54f7f into rust-lang:master Jul 25, 2025
10 checks passed

rustbot added this to the 1.90.0 milestone Jul 25, 2025

rust-timer added a commit that referenced this pull request Jul 25, 2025

Unrolled build for #142569

bb0dab1

Rollup merge of #142569 - xizheyin:139253, r=davidtwco Suggest clone in user-write-code instead of inside macro Fixes #139253 Inspired by #142543 r? ````@fmease````

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

Suggest clone in user-write-code instead of inside macro#142569

Suggest clone in user-write-code instead of inside macro#142569
bors merged 2 commits intorust-lang:masterfrom
xizheyin:139253

xizheyin commented Jun 16, 2025 •

edited by rustbot

Loading

Uh oh!

rustbot commented Jun 16, 2025

Uh oh!

fmease left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

This comment was marked as duplicate.

Uh oh!

xizheyin left a comment

Uh oh!

xizheyin Jun 17, 2025

Uh oh!

xizheyin commented Jul 15, 2025

Uh oh!

davidtwco left a comment

Uh oh!

davidtwco commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Comments

Conversation

xizheyin commented Jun 16, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 16, 2025

Uh oh!

fmease left a comment • edited 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!

This comment was marked as duplicate.

Uh oh!

xizheyin left a comment

Choose a reason for hiding this comment

Uh oh!

xizheyin Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

xizheyin commented Jul 15, 2025

Uh oh!

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

davidtwco commented Jul 24, 2025

Uh oh!

bors commented Jul 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

xizheyin commented Jun 16, 2025 •

edited by rustbot

Loading

fmease left a comment •

edited

Loading