Rollup of 9 pull requests #109503

matthiaskrgr · 2023-03-22T21:44:44Z

Successful merges:

rustdoc: handle generics better when matching notable traits #108954 (rustdoc: handle generics better when matching notable traits)
refactor/feat: refactor identifier parsing a bit #109203 (refactor/feat: refactor identifier parsing a bit)
Eagerly intern and check CrateNum/StableCrateId collisions #109213 (Eagerly intern and check CrateNum/StableCrateId collisions)
rustc: Remove unused Session argument from some attribute functions #109358 (rustc: Remove unused Session argument from some attribute functions)
Update stdarch #109359 (Update stdarch)
Remove Ty::is_region_ptr #109378 (Remove Ty::is_region_ptr)
Use region-erased self type during IAT selection #109423 (Use region-erased self type during IAT selection)
new solver cleanup + implement coherence #109447 (new solver cleanup + implement coherence)
make link clickable #109501 (make link clickable)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This commit makes the `clean::Type::is_same` non-commutative, so that a generic `impl` matches a concrete return, but a generic return does not match a concrete `impl`. It makes slice and vector Write for `u8` not match on every generic return value.

Bring the the `#![allow(internal_features)]`

…generic, r=camelid rustdoc: handle generics better when matching notable traits This commit makes the `clean::Type::is_same` non-commutative (renaming it `is_doc_subtype_of`), so that a generic `impl` matches a concrete return, but a generic return does not match a concrete `impl`. It makes slice and vector Write for `u8` not match on every generic return value. Fixes rust-lang#100322 Fixes rust-lang#55082 Preview: * https://notriddle.com/rustdoc-demo-html-3/notable-trait-generic/std/vec/struct.Vec.html#method.new * https://notriddle.com/rustdoc-demo-html-3/notable-trait-generic/std/vec/struct.Vec.html#method.from-12 * https://notriddle.com/rustdoc-demo-html-3/notable-trait-generic/std/iter/trait.Iterator.html#method.intersperse_with * https://notriddle.com/rustdoc-demo-html-3/notable-trait-generic/std/string/struct.String.html#method.as_bytes

…=Nilstrieb refactor/feat: refactor identifier parsing a bit \+ error recovery for `expected_ident_found` Prior art: rust-lang#108854

Eagerly intern and check CrateNum/StableCrateId collisions r? ``@cjgillot`` It seems better to check things ahead of time than checking them afterwards. The [previous version](rust-lang#108390) was a bit nonsensical, so this addresses the feedback

rustc: Remove unused `Session` argument from some attribute functions (One auxiliary test file containing one of these functions was unused, so I removed it instead of updating.)

Update stdarch Bring the the `#![allow(internal_features)]` for rust-lang#108955 r? `@Amanieu`

Remove Ty::is_region_ptr Fixes rust-lang#109372

…-in-self-ty, r=compiler-errors Use region-erased self type during IAT selection Split off from rust-lang#109410 as discussed. Fixes rust-lang#109299. Re UI test: I use a reproducer of rust-lang#109299 that contains a name resolution error instead of reproducer [`regionck-2.rs`](https://github.com/rust-lang/rust/blob/fc7ed4af165c27ab5914b93251194f826920cc65/tests/ui/associated-inherent-types/regionck-2.rs) (as found in the `AliasKind::Inherent` PR) since it would (incorrectly) pass typeck in this PR due to the lack of regionck and I'd rather not make *that* a regression test (with or without `known-bug`). ``@rustbot`` label F-inherent_associated_types r? ``@compiler-errors``

new solver cleanup + implement coherence the cleanup: - change `Certainty::unify_and` to consider ambig + overflow to be ambig - rename `trait_candidate_should_be_dropped_in_favor_of` to `candidate_should_be_dropped_in_favor_of` - remove outdated fixme For coherence I mostly just add an ambiguous candidate if the current trait ref is unknowable. I am doing the same for reservation impl where I also just add an ambiguous candidate.

make link clickable

bors · 2023-03-23T03:55:02Z

⌛ Testing commit 783f3a1 with merge e4602c84b48400b96b41d69394fd16500a51cc56...

bors · 2023-03-23T04:11:40Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-03-23T05:00:07Z

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[466/3025] Linking CXX static library lib\libLLVMLineEditor.a
[467/3025] Linking CXX static library lib\libLLVMTableGenGlobalISel.a
[468/3025] Linking CXX static library lib\libLLVMWindowsDriver.a
FAILED: lib/libLLVMWindowsDriver.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMWindowsDriver.a && C:\a\rust\rust\mingw64\bin\ar.exe qc lib\libLLVMWindowsDriver.a  lib/WindowsDriver/CMakeFiles/LLVMWindowsDriver.dir/MSVCPaths.cpp.obj && C:\a\rust\rust\mingw64\bin\ranlib.exe lib\libLLVMWindowsDriver.a && cd ."
C:\a\rust\rust\mingw64\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[469/3025] Linking CXX static library lib\libLLVMTextAPI.a
[470/3025] Linking CXX static library lib\libLLVMDebugInfoCodeView.a
[471/3025] Linking CXX executable bin\FileCheck.exe
[471/3025] Linking CXX executable bin\FileCheck.exe
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\cmake-0.1.48\src\lib.rs:975:5
 finished in 56.046 seconds
Build completed unsuccessfully in 0:03:11
Build completed unsuccessfully in 0:03:11
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

matthiaskrgr · 2023-03-23T06:43:29Z

@bors retry

bors · 2023-03-23T07:01:06Z

⌛ Testing commit 783f3a1 with merge 84dd6df...

bors · 2023-03-23T09:32:30Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 84dd6df to master...

rust-timer · 2023-03-23T09:35:04Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#109501	fe8da10f215fbd4bd82ec74fb45e79607e644d5c
#109447	1fa4eb1d90822dae199d72266b2f232b38241c5b
#109423	879a5ec76adcb4898c7352f7af7696cea9a99387
#109378	ca7d1e939519fa44712d7e8537144e6bf12f52f5
#109359	23779c7b5d17d892b25c30c9a562ab4f0ca3cc91
#109358	ebeccc8ec331bb77e94191798b2595dc4af3daee
#109213	82edea25597203d20eefe90822c981dbe0c6e02c
#109203	bfaae77226bf50fc37da98b8cf5781dcc97ad3a0
#108954	6331a0c6f94efd9ac9de77ef502287065e4560a5

previous master: cf811810fe

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-03-23T11:31:12Z

Finished benchmarking commit (84dd6df): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.5%	[-1.7%, -1.4%]	2
Improvements ✅ (secondary)	-2.4%	[-5.3%, -0.3%]	13
All ❌✅ (primary)	-0.9%	[-1.7%, 0.5%]	3

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)	2.6%	[2.6%, 2.6%]	1
Regressions ❌ (secondary)	2.2%	[0.6%, 3.0%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.9%	[-3.6%, -0.7%]	3
All ❌✅ (primary)	2.6%	[2.6%, 2.6%]	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)	-	-	0
Regressions ❌ (secondary)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.6%	[-2.3%, -0.6%]	3
All ❌✅ (primary)	-	-	0

rylev · 2023-03-28T13:17:33Z

The one regression is outweighed by many other improvements. Given this is a rollup which requires extra steps to investigate regressions, I think it's safe to mark this as triaged.

@rustbot label: +perf-regression-triaged

notriddle and others added 28 commits March 9, 2023 13:45

rustdoc: move notable trait tests into their own directory

c601585

rustdoc: rename Type::is_same to is_doc_subtype_of

86179c4

rustdoc: fix comments in test

bfb66eb

Add clarifying comments

7f76084

refactor: refactor identifier parsing somewhat

c9ddb73

refactor: improve "ident starts with number" error

b4e17a5

Update stdarch

4da7970

Bring the the `#![allow(internal_features)]`

Add #![feature(generic_arg_infer)] to core for stdarch

43008ce

Remove Ty::is_region_ptr

20dc532

feat: implement error recovery in expected_ident_found

05b5046

Eagerly intern and check CrateNum/StableCrateId collisions

460ecd2

new solver cleanup + coherence

47f24a8

enable intercrate in the solver InferCtxt

938434a

disable global caching during coherence

a7ec045

woops

f86b035

iat selection: erase regions in self type

293f21c

rustc: Remove unused Session argument from some attribute functions

67a2c5b

make link clickable

1581b97

Rollup merge of rust-lang#109203 - Ezrashaw:refactor-ident-parsing, r…

34fa6da

…=Nilstrieb refactor/feat: refactor identifier parsing a bit \+ error recovery for `expected_ident_found` Prior art: rust-lang#108854

Rollup merge of rust-lang#109358 - petrochenkov:nosess, r=cjgillot

577d85f

rustc: Remove unused `Session` argument from some attribute functions (One auxiliary test file containing one of these functions was unused, so I removed it instead of updating.)

Rollup merge of rust-lang#109359 - Nilstrieb:bump-stdarch, r=Amanieu

29d04ff

Update stdarch Bring the the `#![allow(internal_features)]` for rust-lang#108955 r? `@Amanieu`

Rollup merge of rust-lang#109378 - MU001999:master, r=scottmcm

2ee07a1

Remove Ty::is_region_ptr Fixes rust-lang#109372

Rollup merge of rust-lang#109501 - lukas-code:link, r=WaffleLapkin

783f3a1

make link clickable

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 Mar 22, 2023

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 Mar 23, 2023

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

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 Mar 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2023

bors merged commit 84dd6df into rust-lang:master Mar 23, 2023

rustbot added this to the 1.70.0 milestone Mar 23, 2023

bors mentioned this pull request Mar 23, 2023

Support #[global_allocator] without the allocator shim #86844

Merged

rustbot added the perf-regression Performance regression. label Mar 23, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Mar 28, 2023

matthiaskrgr deleted the rollup-cnp7kdd branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #109503

Rollup of 9 pull requests #109503

matthiaskrgr commented Mar 22, 2023

bors commented Mar 23, 2023

bors commented Mar 23, 2023

rust-log-analyzer commented Mar 23, 2023

matthiaskrgr commented Mar 23, 2023

bors commented Mar 23, 2023

bors commented Mar 23, 2023

rust-timer commented Mar 23, 2023

rust-timer commented Mar 23, 2023

rylev commented Mar 28, 2023

Rollup of 9 pull requests #109503

Rollup of 9 pull requests #109503

Conversation

matthiaskrgr commented Mar 22, 2023

bors commented Mar 23, 2023

bors commented Mar 23, 2023

rust-log-analyzer commented Mar 23, 2023

matthiaskrgr commented Mar 23, 2023

bors commented Mar 23, 2023

bors commented Mar 23, 2023

rust-timer commented Mar 23, 2023

rust-timer commented Mar 23, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

rylev commented Mar 28, 2023