Always print '_, even for erased lifetimes. #102068

cjgillot · 2022-09-20T20:16:35Z

Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.

rust-highfive · 2022-09-20T20:16:38Z

r? @eholk

(rust-highfive has picked a reviewer for you, use r? to override)

eholk · 2022-09-20T22:17:48Z

@bors r+

eholk · 2022-09-20T22:19:24Z

Ah, looks like a few more tests still need blessed, but you can r=me after they're passing.

cjgillot · 2022-09-21T18:51:10Z

@bors r=eholk

bors · 2022-09-21T18:51:12Z

📌 Commit eee64a0 has been approved by eholk

It is now in the queue for this repository.

…eholk Always print '_, even for erased lifetimes. Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.

Dylan-DPC · 2022-09-22T12:52:28Z

@bors r-

Dylan-DPC · 2022-09-22T12:52:56Z

failed in rollup

rustbot · 2022-09-22T17:39:48Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

cjgillot · 2022-09-22T17:43:26Z

@bors r=eholk

bors · 2022-09-22T17:43:28Z

📌 Commit e01a3bd has been approved by eholk

It is now in the queue for this repository.

aliemjay · 2022-09-22T17:55:09Z

Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021.

I wonder if this if this is true in the ValueNS as well? I guess the convention there is to not . I mean I probably see some_fn::<T>() more than some_fn::<'_, T>("").

aliemjay · 2022-09-22T18:00:21Z

src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff

@@ -38,10 +38,10 @@
          StorageLive(_4);                 // scope 0 at $DIR/funky_arms.rs:+4:9: +4:19
          StorageLive(_5);                 // scope 0 at $DIR/funky_arms.rs:+4:22: +4:37
          _5 = &(*_1);                     // scope 0 at $DIR/funky_arms.rs:+4:22: +4:37
-          _4 = Formatter::sign_plus(move _5) -> bb1; // scope 0 at $DIR/funky_arms.rs:+4:22: +4:37
+          _4 = Formatter::<'_>::sign_plus(move _5) -> bb1; // scope 0 at $DIR/funky_arms.rs:+4:22: +4:37


ah, see this one! I don't think Formatter::<'_>::sign_plus is more prefereable to Formatter::sign_plus

I don't think this is an issue. Diagnostics only use this in TypeNs position, so that's good. MIR dump is an internal debugging tool, so having non-beginner-friendly printing should be ok.

…eholk Always print '_, even for erased lifetimes. Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.

matthiaskrgr · 2022-09-23T13:28:57Z

@bors r- failed in a rollup
https://github.com/rust-lang-ci/rust/actions/runs/3112700014/jobs/5046428066#step:25:13268
#102180

ChrisDenton · 2022-09-23T14:26:15Z

It just needs the src/tools/miri test to be updated:

--- tests/fail\concurrency\windows_join_detached.stderr
+++ <stderr output>
... 8 lines skipped ...
    = note: BACKTRACE:
    = note: inside `std::sys::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/PLATFORM/thread.rs:LL:CC
~   = note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
    = note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
 note: inside `main` at $DIR/windows_join_detached.rs:LL:CC
... 10 lines skipped ...

saethlin · 2022-09-23T16:15:37Z

I think you just need to run ./miri bless then check in the diff.

cjgillot · 2022-09-23T17:42:35Z

@saethlin How do I run ./miri bless from x.py? Are there docs for this with the subtree?

saethlin · 2022-09-23T18:59:30Z

That would probably be a question for @oli-obk, I've never operated the Miri tests from x.py.

RalfJung · 2022-09-23T21:22:35Z

How do I run ./miri bless from x.py? Are there docs for this with the subtree?

./x.py test src/tools/miri --stage 0 --bless -- except currently you have to use --stage 1 due to a cargo bug (rust-lang/cargo#11138).

I don't think we have those docs yet, where should they usually go?

rustbot · 2022-09-23T22:10:53Z

The Miri subtree was changed

cc @rust-lang/miri

cjgillot · 2022-09-23T22:18:42Z

@bors r=eholk rollup=iffy

bors · 2022-09-23T22:18:44Z

📌 Commit eb1ddd2 has been approved by eholk

It is now in the queue for this repository.

bors · 2022-09-24T01:23:20Z

⌛ Testing commit eb1ddd2 with merge e1c28e0...

bors · 2022-09-24T04:04:12Z

☀️ Test successful - checks-actions
Approved by: eholk
Pushing e1c28e0 to master...

rust-timer · 2022-09-24T05:36:18Z

Finished benchmarking commit (e1c28e0): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.3%	[-1.4%, -1.1%]	6
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	3.4%	[3.4%, 3.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.4%	[3.4%, 3.4%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	2.4%	[2.2%, 2.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	2.4%	[2.2%, 2.6%]	2

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

Always print '_, even for erased lifetimes. Explicit lifetime arguments are now the recommended syntax in rust 2018 and rust 2021. This PR applies this discipline to rustc itself.

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 20, 2022

rust-highfive assigned eholk Sep 20, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 20, 2022

This comment has been minimized.

Sign in to view

cjgillot force-pushed the erased-lifetime-print branch from 20da4f0 to eee64a0 Compare September 21, 2022 18:15

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 Sep 21, 2022

Dylan-DPC mentioned this pull request Sep 22, 2022

Rollup of 6 pull requests #102126

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 22, 2022

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 22, 2022

aliemjay reviewed Sep 22, 2022

View reviewed changes

matthiaskrgr mentioned this pull request Sep 23, 2022

Rollup of 7 pull requests #102180

Closed

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 23, 2022

cjgillot added 5 commits September 23, 2022 18:42

Always print '_, even for erased lifetimes.

aac2c7d

Bless cgu test.

f114991

Bless pretty tests.

8de8115

Bless 32bit ui.

8077d03

Bless clippy.

9b83e31

Bless miri.

eb1ddd2

cjgillot force-pushed the erased-lifetime-print branch from e01a3bd to eb1ddd2 Compare September 23, 2022 22:10

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2022

bors merged commit e1c28e0 into rust-lang:master Sep 24, 2022

rustbot added this to the 1.66.0 milestone Sep 24, 2022

This was referenced Sep 24, 2022

Don't duplicate region names for late-bound regions in print of Binder #101996

Merged

Allow transmutes between the same types after erasing lifetimes #101520

Merged

cjgillot deleted the erased-lifetime-print branch September 24, 2022 08:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Always print '_, even for erased lifetimes. #102068

Always print '_, even for erased lifetimes. #102068

cjgillot commented Sep 20, 2022

rust-highfive commented Sep 20, 2022

eholk commented Sep 20, 2022 •

edited

Loading

eholk commented Sep 20, 2022

This comment has been minimized.

cjgillot commented Sep 21, 2022

bors commented Sep 21, 2022

Dylan-DPC commented Sep 22, 2022

Dylan-DPC commented Sep 22, 2022

rustbot commented Sep 22, 2022

cjgillot commented Sep 22, 2022

bors commented Sep 22, 2022

aliemjay commented Sep 22, 2022

aliemjay Sep 22, 2022 •

edited

Loading

cjgillot Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

ChrisDenton commented Sep 23, 2022

saethlin commented Sep 23, 2022

cjgillot commented Sep 23, 2022

saethlin commented Sep 23, 2022

RalfJung commented Sep 23, 2022

rustbot commented Sep 23, 2022

cjgillot commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

rust-timer commented Sep 24, 2022

Always print '_, even for erased lifetimes. #102068

Always print '_, even for erased lifetimes. #102068

Conversation

cjgillot commented Sep 20, 2022

rust-highfive commented Sep 20, 2022

eholk commented Sep 20, 2022 • edited Loading

eholk commented Sep 20, 2022

This comment has been minimized.

cjgillot commented Sep 21, 2022

bors commented Sep 21, 2022

Dylan-DPC commented Sep 22, 2022

Dylan-DPC commented Sep 22, 2022

rustbot commented Sep 22, 2022

cjgillot commented Sep 22, 2022

bors commented Sep 22, 2022

aliemjay commented Sep 22, 2022

aliemjay Sep 22, 2022 • edited Loading

Choose a reason for hiding this comment

cjgillot Sep 23, 2022

Choose a reason for hiding this comment

matthiaskrgr commented Sep 23, 2022

ChrisDenton commented Sep 23, 2022

saethlin commented Sep 23, 2022

cjgillot commented Sep 23, 2022

saethlin commented Sep 23, 2022

RalfJung commented Sep 23, 2022

rustbot commented Sep 23, 2022

cjgillot commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 24, 2022

bors commented Sep 24, 2022

rust-timer commented Sep 24, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

eholk commented Sep 20, 2022 •

edited

Loading

aliemjay Sep 22, 2022 •

edited

Loading