Introduce #[diagnostic::on_move(message)] by rperier · Pull Request #150935 · rust-lang/rust

rperier · 2026-01-10T18:09:26Z

This is a first proposal. I have deliberately kept it simpler than diagnostic::on_unimplemented.

Few questions/remarks:

Do I need to move the OnMoveDirective logic into a dedicated module perhaps ? let's say into compiler/rustc_borrowck/src/diagnostics/on_move.rs
No problems to depend on crates like rustc_ast from the borrowck ?
Notes are not supported yet. While message and label are very static , in the sense that they are emitted in the same way from the same place in the borrowck, it is not the case for the notes. It would make the code more complex. But, I can add support for notes if it does make sense.

Suggestions are welcomed !

rustbot · 2026-01-10T18:09:30Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

rustbot · 2026-01-10T18:09:32Z

r? @JonathanBrouwer

rustbot has assigned @JonathanBrouwer.
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

rperier · 2026-01-10T18:11:08Z

r? @estebank

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

mejrs · 2026-01-13T18:28:02Z

I'm currently working on migrating the existing diagnostic attribute infrastructure, can you do this PR after that? It's going to be quite a mess to resolve that conflict.

Is this meant to be only used by the standard library or also by users? If only by std, I think you should forego the attribute and instead check whether T implements UseCloned and recommend a clone (or .use if on nightly).

rperier · 2026-01-14T07:05:01Z

Yeah I can completly wait until you finished your work and do my PR after that, It was my intention to be honest . Resolving conflicts or rebasing is not an issue for me.

rustbot · 2026-01-21T19:15:46Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann, @JonathanBrouwer

Changes to the size of AST and/or HIR nodes.

cc @nnethercote

Some changes occurred in compiler/rustc_hir/src/attrs

cc @jdonszelmann, @JonathanBrouwer

rperier · 2026-01-21T19:16:23Z

I have reworked my code and moved everything to rustc_attr_parsing and rustc_hir/src/attrs/data_structures.rs. Few questions/remarks remain:

Perhaps, It would make sense to allow this diagnostic attribute to be used only for nightly, for now, what do you think ?
I can wait until some refactoring for attributes are merged upstream, and wait for my PR being merged after that, if it helps, no problems for me

tests/ui/stats/input-stats.stderr

rperier · 2026-01-22T19:23:55Z

Rebased onto main, I have also fixed the size of AttributeKind::OnMove

tests/ui/diagnostic_namespace/on_move/report_warning_on_malformed_options_without_delimiters.rs

compiler/rustc_hir/src/attrs/data_structures.rs

rperier · 2026-01-28T14:25:48Z

Rebased onto main. I have covered changes related to #151516 .
I assume that changes are still underway in rustc_attr_parsing , but I would be nice to discuss about generic meta item list errors:

Do a generic lint will be emitted by the parser itself in this case ? Instead of the parser of each diagnostic attribute has to do it by itself.. it would be better for code refactoring.
In case this is not the case, it might be helpful to being able to retrieve the span of the error instead of the span of the whole diagnostic attribute (better granularity) . See the previous discussion.

If I can help for this (by proposing a patch for a generic lint, for example), feel free to ask.

compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs

.../ui/diagnostic_namespace/on_move/report_warning_on_malformed_options_without_literals.stderr

tests/ui/diagnostic_namespace/on_move/report_warning_on_malformed_options_without_delimiters.rs

rustbot · 2026-03-06T15:20:10Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

mejrs

Diagnostic attributes can't emit errors, you have to emit lints instead in some places.

View changes since this review

compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs

rperier · 2026-03-10T06:51:00Z

I will look into it this week. Thanks for your time and your feedbacks.

rperier · 2026-03-11T15:51:03Z

* for when we hit an explicit `Copy` bound, like `fn take_copy<T: Copy>(t: T){}`; then this attribute should do nothing. (or should it?)

View changes since this review

I don't see the point in adding a test case for this. In a case like that either the type passed as argument does not impl the Copy trait, so you will get a trait bound error (not a borrowck error), or the type passed as argument impls the Copy trait, in which case it will be passed by copy and not by value, so it won't be moved. so the borrowck won't complained in such a case.

EDIT: we should already have non regression testing for Copy no ? I think a case like this one is probably already covered.

This might be helpful for smart pointers to explains why they aren't Copy and what to do instead or just to let the user know that .clone() is very cheap and can be called without a performance penalty.

rustbot · 2026-03-11T15:59:31Z

This PR was rebased onto a different main 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.

rperier · 2026-03-11T16:00:49Z

Except my last remark regarding the Copy trait, everything should be fixed.

@rustbot ready

JonathanBrouwer · 2026-03-13T17:28:10Z

I'm on holidays atm, will take a look in a few days :)

rperier · 2026-03-13T17:32:53Z

I'm on holidays atm, will take a look in a few days :)

No problem, have nice holidays then 😉

JonathanBrouwer

I think this PR is fine the way it currently is :)
I checked that all previous conversations are resolved, and fully went through the changes one more time.
Thanks for all the hard work!

@bors r+ rollup

View changes since this review

rust-bors · 2026-03-19T22:16:52Z

📌 Commit 965f1e7 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rperier · 2026-03-20T05:56:39Z

Thanks for your time and your feedbacks ! Next step is perhaps update the documentation regarding this diagnostic attribute, what do you think ?

Rollup of 15 pull requests Successful merges: - #152909 (sess: `-Zbranch-protection` is a target modifier) - #153556 (`impl` restriction lowering) - #154048 (Don't emit rustdoc `missing_doc_code_examples` lint on impl items) - #150935 (Introduce #[diagnostic::on_move(message)]) - #152973 (remove -Csoft-float) - #153862 (Rename `cycle_check` to `find_cycle`) - #153992 (bootstrap: Optionally print a backtrace if a command fails) - #154019 (two smaller feature cleanups) - #154059 (tests: Activate `must_not_suspend` test for `MutexGuard` dropped before `await`) - #154075 (Rewrite `query_ensure_result`.) - #154082 (Updates derive_where and removes workaround) - #154084 (Preserve braces around `self` in use tree pretty printing) - #154086 (Insert space after float literal ending with `.` in pretty printer) - #154087 (Fix whitespace after fragment specifiers in macro pretty printing) - #154109 (tests: Add regression test for async closures involving HRTBs)

JonathanBrouwer · 2026-03-20T10:37:14Z

Adding it to the reference would be lovely
https://doc.rust-lang.org/reference/attributes/diagnostics.html#the-diagnostic-tool-attribute-namespace

mejrs

Thanks for your time and your feedbacks ! Next step is perhaps update the documentation regarding this diagnostic attribute, what do you think ?

Adding it to the reference would be lovely https://doc.rust-lang.org/reference/attributes/diagnostics.html#the-diagnostic-tool-attribute-namespace

This is unstable, so it should be in the unstable book, not the reference. See https://doc.rust-lang.org/nightly/unstable-book/language-features/diagnostic-on-const.html for example. It's up to you whether you do this or how much effort you put into this. It'd be nice if it's written in a "referencey" way; that'll be nice for when it gets stabilized.

@JonathanBrouwer #149862 can be closed now.

View changes since this review

mejrs · 2026-03-20T20:34:14Z

compiler/rustc_feature/src/unstable.rs

    /// Allows giving non-const impls custom diagnostic messages if attempted to be used as const
    (unstable, diagnostic_on_const, "1.93.0", Some(143874)),
+    /// Allows giving on-move borrowck custom diagnostic messages for a type
+    (unstable, diagnostic_on_move, "CURRENT_RUSTC_VERSION", Some(150935)),


This should be pointing to a tracking issue (please make one!), not this PR.

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2026

rustbot assigned JonathanBrouwer Jan 10, 2026

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 10, 2026

rustbot assigned estebank and unassigned JonathanBrouwer Jan 10, 2026

fmease reviewed Jan 10, 2026

View reviewed changes

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated Show resolved Hide resolved

JonathanBrouwer mentioned this pull request Jan 13, 2026

Port diagnostic::do_not_recommend to new attr parsing #151056

Merged

rperier force-pushed the provide_diagnostic_on_move_for_smart_pointers branch from 9a0162d to 8071a7d Compare January 21, 2026 19:15