clean up some old const trait impl syntax

[npmccallum]

Related to: #143874

[rustbot]

r? @ibraheemdev

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

[rustbot]

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

[zachs18]

I think these two lines need to be flipped in rustfmt, so it formats the visibility of a trait before the constness.

rust/src/tools/rustfmt/src/items.rs

Lines 1178 to 1179 in 828e45a

	format_constness(constness),
	format_visibility(context, &item.vis),

Also, I think the tidy checks use bootstrap~~/beta~~ rustfmt, not in-tree rustfmt, so fixing rustfmt will probably need to happen first, then the stdlib changes will probably be blocked on the rustfmt fix reaching beta.

[bjorn3]

We use a pinned nightly for rustfmt, so landing a rustfmt change and updating rustfmt the next day should work.

[npmccallum]

It seems that this:

rust/src/tools/rustfmt/src/items.rs

Lines 1176 to 1182 in 84a1747

	let header = format!(
	"{}{}{}{}trait ",
	format_constness(constness),
	format_visibility(context, &item.vis),
	format_safety(safety),
	format_auto(is_auto),
	);

Conflicts with:

https://github.com/rust-lang/rustfmt/blob/0332da01486508710f2a542111e40513bfb215aa/src/items.rs#L1169-L1174

[rustbot]

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

[bors]

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

[bors]

📌 Commit 7e98eb1 has been approved by fmease

It is now in the queue for this repository.

[fmease]

@bors r-

[fmease]

Diff

Also migrated Borrow, BorrowMut and FunnelShift while we're already at it. I couldn't migrate BytewiseEq and SliceIndex due to #146122.

[fmease]

@bors r+

[bors]

📌 Commit 09550d5 has been approved by fmease

It is now in the queue for this repository.

[fmease]

@bors r-

[fmease]

@bors r+

[bors]

📌 Commit 00fcb14 has been approved by fmease

It is now in the queue for this repository.

[bors]

⌛ Testing commit 00fcb14 with merge 397f933...

[bors]

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 397f933 to master...

[github-actions]

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 545819d (parent) -> 397f933 (this PR)

Test differences

Show 574 test diffs

574 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 397f93362974d298b79e0e0cd43677014aa7b722 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

1. dist-aarch64-apple: 7127.9s -> 10944.8s (53.5%)
2. i686-gnu-nopt-1: 8109.7s -> 7173.9s (-11.5%)
3. aarch64-gnu: 7056.2s -> 6291.7s (-10.8%)
4. dist-aarch64-msvc: 5547.8s -> 6090.9s (9.8%)
5. x86_64-gnu-debug: 7297.9s -> 6588.4s (-9.7%)
6. dist-s390x-linux: 4801.4s -> 5246.1s (9.3%)
7. x86_64-rust-for-linux: 2873.6s -> 2608.7s (-9.2%)
8. dist-ohos-aarch64: 4166.7s -> 4539.5s (8.9%)
9. aarch64-apple: 5430.0s -> 5905.2s (8.8%)
10. aarch64-gnu-debug: 4269.5s -> 3906.1s (-8.5%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

[rust-timer]

Finished benchmarking commit (397f933): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -4.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results (secondary -0.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Bootstrap: 468.318s -> 467.607s (-0.15%)
Artifact size: 390.56 MiB -> 390.55 MiB (-0.00%)