Convert `proc_macro_back_compat` lint to an unconditional error. #125596

nnethercote · 2024-05-27T00:39:09Z

We still check for the rental/allsorts-rental crates. But now if they are detected we just emit a fatal error, instead of emitting a warning and providing alternative behaviour.

The original "hack" implementing alternative behaviour was added in #73345.

The lint was added in #83127.

The tracking issue is #83125.

The direct motivation for the change is that providing the alternative behaviour is interfering with #125174 and follow-on work.

r? @estebank

nnethercote · 2024-05-27T00:39:46Z

I'm not 100% certain this is the right way to do this, but it seems like a reasonable first attempt.

cc @petrochenkov @Aaron1011

bors · 2024-05-27T11:51:20Z

☔ The latest upstream changes (presumably #125410) made this pull request unmergeable. Please resolve the merge conflicts.

estebank · 2024-05-27T18:30:49Z

@bors try

Gonna do a crater run as a sanity check that we haven't missed something, but otherwise I'm ok with landing this change as is. We provide actionable user feedback while removing the hack and without blocking your other work. This is the best possible resolution, beyond a more advanced/generalized mechanism to handle popular dependency versions with known issues.

bors · 2024-05-27T18:31:59Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rental-hard-error (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rental-hard-error --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/ui/proc-macro/pretty-print-hack-show.remapped.stdout
Removing tests/ui/proc-macro/pretty-print-hack-show.local.stdout
Auto-merging compiler/rustc_lint_defs/src/lib.rs
Auto-merging compiler/rustc_lint_defs/src/builtin.rs
Auto-merging compiler/rustc_lint/src/lints.rs
Auto-merging compiler/rustc_lint/src/context/diagnostics.rs
CONFLICT (content): Merge conflict in compiler/rustc_lint/src/context/diagnostics.rs
Auto-merging compiler/rustc_expand/src/mbe/transcribe.rs
Automatic merge failed; fix conflicts and then commit the result.

To reduce indentation and improve readability.

We still check for the `rental`/`allsorts-rental` crates. But now if they are detected we just emit a fatal error, instead of emitting a warning and providing alternative behaviour. The original "hack" implementing alternative behaviour was added in rust-lang#73345. The lint was added in rust-lang#83127. The tracking issue is rust-lang#83125. The direct motivation for the change is that providing the alternative behaviour is interfering with rust-lang#125174 and follow-on work.

nnethercote · 2024-05-27T22:22:49Z

I rebased.

@bors try

bors · 2024-05-27T22:23:59Z

⌛ Trying commit cf0c2c7 with merge c57a122...

Convert `proc_macro_back_compat` lint to an unconditional error. We still check for the `rental`/`allsorts-rental` crates. But now if they are detected we just emit a fatal error, instead of emitting a warning and providing alternative behaviour. The original "hack" implementing alternative behaviour was added in rust-lang#73345. The lint was added in rust-lang#83127. The tracking issue is rust-lang#83125. The direct motivation for the change is that providing the alternative behaviour is interfering with rust-lang#125174 and follow-on work. r? `@estebank`

bors · 2024-05-27T23:54:36Z

☀️ Try build successful - checks-actions
Build commit: c57a122 (c57a122e6bc7d3e243f3b2a000b6916cb51ef149)

nnethercote · 2024-05-27T23:58:23Z

@craterbot check

craterbot · 2024-05-27T23:58:30Z

👌 Experiment pr-125596 created and queued.
🤖 Automatically detected try build c57a122
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

Noratrieb · 2024-05-28T05:30:01Z

compiler/rustc_expand/src/base.rs

+
+        if crate_matches {
+            // FIXME: make this translatable
+            #[allow(rustc::untranslatable_diagnostic)]


this looks very translatable now

craterbot · 2024-05-30T14:16:23Z

🚧 Experiment pr-125596 is now running

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

craterbot · 2024-06-01T11:59:26Z

🎉 Experiment pr-125596 is completed!
📊 100 regressed and 1 fixed (466636 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

nnethercote · 2024-06-01T12:25:13Z

Crater results are very much as expected.

The vast majority of the failures have the expected message:

error: using an old version of rental
|
= note: older versions of the rental crate no longer compile; please update to rental v0.5.6, or switch to one of the rental alternative

A few had "no space left on device" (just running out of disk space):

One had "error: failed to download aho-corasick v1.1.3" (clearly a network error)

https://crater-reports.s3.amazonaws.com/pr-125596/try%23c57a122e6bc7d3e243f3b2a000b6916cb51ef149/reg/moon_pdk_api-0.0.6/log.txt

Two had "collect2: fatal error: ld terminated with signal 7 [Bus error], core dumped" (linker crash?!)

Other notes

Most of the rental failures are in personal repos, presumably for long-abandoned personal projects.
Only 11 are are in published crates. They are all at least 3 years old.

This all looks fine to me. @estebank, what do you think?

estebank · 2024-06-04T06:24:43Z

@bors r+

bors · 2024-06-04T06:24:46Z

📌 Commit cf0c2c7 has been approved by estebank

It is now in the queue for this repository.

nnethercote · 2024-06-04T07:08:51Z

@bors rollup

…stebank Convert `proc_macro_back_compat` lint to an unconditional error. We still check for the `rental`/`allsorts-rental` crates. But now if they are detected we just emit a fatal error, instead of emitting a warning and providing alternative behaviour. The original "hack" implementing alternative behaviour was added in rust-lang#73345. The lint was added in rust-lang#83127. The tracking issue is rust-lang#83125. The direct motivation for the change is that providing the alternative behaviour is interfering with rust-lang#125174 and follow-on work. r? `@estebank`

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#106186 (Add function `core::iter::chain`) - rust-lang#125596 (Convert `proc_macro_back_compat` lint to an unconditional error.) - rust-lang#125696 (Explain differences between `{Once,Lazy}{Cell,Lock}` types) - rust-lang#125917 (Create `run-make` `env_var` and `env_var_os` helpers) - rust-lang#125927 (Ignore `vec_deque_alloc_error::test_shrink_to_unwind` test on non-unwind targets) - rust-lang#125930 (feat(opt-dist): new flag `--benchmark-cargo-config`) - rust-lang#125932 (Fix typo in the docs of `HashMap::raw_entry_mut`) - rust-lang#125933 (Update books) - rust-lang#125944 (Update fuchsia maintainers) - rust-lang#125946 (Include trailing commas in wrapped function declarations [RustDoc]) - rust-lang#125973 (Remove `tests/run-make-fulldeps/pretty-expanded`) Failed merges: - rust-lang#125815 (`rustc_parse` top-level cleanups) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125596 - nnethercote:rental-hard-error, r=estebank Convert `proc_macro_back_compat` lint to an unconditional error. We still check for the `rental`/`allsorts-rental` crates. But now if they are detected we just emit a fatal error, instead of emitting a warning and providing alternative behaviour. The original "hack" implementing alternative behaviour was added in rust-lang#73345. The lint was added in rust-lang#83127. The tracking issue is rust-lang#83125. The direct motivation for the change is that providing the alternative behaviour is interfering with rust-lang#125174 and follow-on work. r? ``@estebank``

rustbot assigned estebank May 27, 2024

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 May 27, 2024

This was referenced May 27, 2024

Remove proc-macro back-compat hack for rental #106060

Closed

Print token::Interpolated with token stream pretty printing. #125174

Merged

estebank approved these changes May 27, 2024

View reviewed changes

nnethercote added 3 commits May 28, 2024 08:14

Remove a stray comment that shouldn't be here.

d6d2ff0

Use let chains in pretty_printing_compatibility_hack.

3607cee

To reduce indentation and improve readability.

nnethercote force-pushed the rental-hard-error branch from b5e92ae to cf0c2c7 Compare May 27, 2024 22:22

craterbot added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 27, 2024

Noratrieb reviewed May 28, 2024

View reviewed changes

craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Jun 1, 2024

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 Jun 4, 2024

compiler-errors mentioned this pull request Jun 4, 2024

Rollup of 9 pull requests #125975

Closed

GuillaumeGomez mentioned this pull request Jun 4, 2024

Rollup of 11 pull requests #125989

Merged

bors merged commit fa96e2c into rust-lang:master Jun 4, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone Jun 4, 2024

nnethercote deleted the rental-hard-error branch June 5, 2024 00:27

nnethercote mentioned this pull request Jun 9, 2024

Tracking Issue for proc_macro_back_compat #83125

Open

estebank mentioned this pull request Aug 22, 2024

Revert "alloc: implement FromIterator for Box<str>" #129379

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert `proc_macro_back_compat` lint to an unconditional error. #125596

Convert `proc_macro_back_compat` lint to an unconditional error. #125596

nnethercote commented May 27, 2024

nnethercote commented May 27, 2024

bors commented May 27, 2024

estebank commented May 27, 2024

bors commented May 27, 2024

nnethercote commented May 27, 2024

bors commented May 27, 2024

bors commented May 27, 2024

nnethercote commented May 27, 2024

craterbot commented May 27, 2024

Noratrieb May 28, 2024

craterbot commented May 30, 2024

craterbot commented Jun 1, 2024

nnethercote commented Jun 1, 2024 •

edited

Loading

estebank commented Jun 4, 2024

bors commented Jun 4, 2024

nnethercote commented Jun 4, 2024

Convert proc_macro_back_compat lint to an unconditional error. #125596

Convert proc_macro_back_compat lint to an unconditional error. #125596

Conversation

nnethercote commented May 27, 2024

nnethercote commented May 27, 2024

bors commented May 27, 2024

estebank commented May 27, 2024

bors commented May 27, 2024

nnethercote commented May 27, 2024

bors commented May 27, 2024

bors commented May 27, 2024

nnethercote commented May 27, 2024

craterbot commented May 27, 2024

Noratrieb May 28, 2024

Choose a reason for hiding this comment

craterbot commented May 30, 2024

craterbot commented Jun 1, 2024

nnethercote commented Jun 1, 2024 • edited Loading

estebank commented Jun 4, 2024

bors commented Jun 4, 2024

nnethercote commented Jun 4, 2024

Convert `proc_macro_back_compat` lint to an unconditional error. #125596

Convert `proc_macro_back_compat` lint to an unconditional error. #125596

nnethercote commented Jun 1, 2024 •

edited

Loading