Rollup of 8 pull requests #112987

compiler-errors · 2023-06-24T02:47:23Z

Successful merges:

Implement Sync for mpsc::Sender #111087 (Implement Sync for mpsc::Sender)
Bump compiler_builtins #112763 (Bump compiler_builtins)
Stop bubbling out hidden types from the eval obligation queries #112963 (Stop bubbling out hidden types from the eval obligation queries)
Don't emit same goal as input during wf::unnormalized_obligations #112965 (Don't emit same goal as input during wf::unnormalized_obligations)
Make sure to include default en-US ftl resources for rustc_error crate #112973 (Make sure to include default en-US ftl resources for rustc_error crate)
Fix return type notation errors with -Zlower-impl-trait-in-trait-to-assoc-ty #112981 (Fix return type notation errors with -Zlower-impl-trait-in-trait-to-assoc-ty)
Fix return type notation associated type suggestion when -Zlower-impl-trait-in-trait-to-assoc-ty #112983 (Fix return type notation associated type suggestion when -Zlower-impl-trait-in-trait-to-assoc-ty)
Update cargo #112986 (Update cargo)

r? @ghost
@rustbot modify labels: rollup

…ssoc-ty

…soc-ty

Implement `Sync` for `mpsc::Sender` `mpsc::Sender` is currently `!Sync` because the previous implementation contained an optimization where the channel started out as single-producer and was dynamically upgraded on the first clone, which relied on a unique reference to the sender. This optimization is one of the main reasons the old implementation was so complex and was removed in rust-lang#93563. `mpsc::Sender` can now soundly implement `Sync`. Note for any potential confusion, this chance does *not* add MPMC behavior. This only affects the already `Send + Clone` *sender*, not *receiver*. It's technically possible to rely on the `!Sync` behavior in the same way as a `PhantomData<*mut T>`, but that seems very unlikely in practice. Either way, this change is insta-stable and needs an FCP. `@rustbot` label +T-libs-api -T-libs

…=Amanieu Bump compiler_builtins Actually closes rust-lang#108489. Note that the example code given [in compiler_builtins](rust-lang/compiler-builtins#527) doesn't compile on current rustc since we're still waiting for https://reviews.llvm.org/D153197 (aka `LLVM ERROR: Expected a constant shift amount!`), but it's a step forward anyway.

…compiler-errors Stop bubbling out hidden types from the eval obligation queries r? `@compiler-errors` I don't know why these were added, but they are not needed anymore. The relevant test is unaffected and I didn't see anything interesting in logging that would have justified it. This PR has no effect on the new solver behaviour of https://github.com/rust-lang/rust/blob/cf2dff2b1e3fa55fa5415d524200070d0d7aacfe/tests/ui/impl-trait/issue-99642.rs (which is overflow) and https://github.com/rust-lang/rust/blob/cf2dff2b1e3fa55fa5415d524200070d0d7aacfe/tests/ui/impl-trait/issue-99642-2.rs (which is "unstable certainty ICE")

…emjay Don't emit same goal as input during `wf::unnormalized_obligations` r? `@aliemjay` cc `@lcnr` I accidentally pruned the logic to handle `WF(?0)` when writing `wf::unnormalized_obligations`. idk if you wanted to construct a test first, but this is an obvious fix. Copied the comment from above. Fixes rust-lang/trait-system-refactor-initiative#36

…=jyn514 Make sure to include default en-US ftl resources for `rustc_error` crate Fixes rust-lang#112928

…er-errors Fix return type notation errors with -Zlower-impl-trait-in-trait-to-assoc-ty This just adjust the way we check for RPITITs and uses the new helper method to do the "old" and "new" check at once. r? `@compiler-errors`

…er-errors Fix return type notation associated type suggestion when -Zlower-impl-trait-in-trait-to-assoc-ty This avoid suggesting the associated types generated for RPITITs when the one the code refers to doesn't exist and rustc looks for a suggestion. r? `@compiler-errors`

Update cargo 8 commits in 4cebd130ebca3bc219180a54f3e26cc1b14a91de..03bc66b55c290324bd46eb22e369c8fae1908f91 2023-06-21 18:59:29 +0000 to 2023-06-23 23:27:46 +0000 - fix(script): Be quiet on programmatic output (rust-lang/cargo#12305) - docs(unstable): Update script documentation (rust-lang/cargo#12308) - cargo script example needs nightly -Zscript feature (rust-lang/cargo#12287) - fix(script): Process config relative to script, not CWD (rust-lang/cargo#12303) - -Znext-lockfile-bump: Don't suggest using -Z on stable (rust-lang/cargo#12302) - build(deps): bump openssl from 0.10.54 to 0.10.55 (rust-lang/cargo#12300) - Add `.toml` file extension restriction for `-Zconfig-include` (rust-lang/cargo#12298) - docs(unstable): Point stable-unstable docs to nightly docs (rust-lang/cargo#12299) r? `@ghost`

compiler-errors · 2023-06-24T02:47:38Z

@bors r+ rollup=never p=8

bors · 2023-06-24T02:47:40Z

📌 Commit d28f037 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-06-24T03:36:22Z

⌛ Testing commit d28f037 with merge e0ba2d0...

bors · 2023-06-24T06:32:06Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing e0ba2d0 to master...

bors · 2023-06-24T06:32:06Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing e0ba2d0 to master...

rust-timer · 2023-06-24T06:34:20Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#112986	d1acc0dd0e3084996c58e32f5786dce57074cbea
#112983	a5541ba2ab9ac564b1af14887436a8611c17e78f
#112981	af68a75ed3af0664bf575df8ab87cba1a3de8a44
#112973	0516e71c554b70fecd80172d48ee5b58b96143a8
#112965	b4e5412578f5ef52c869d8e4b3927c2d1265eae1
#112963	17d3732a5ad1d71698426f1ee59e384246d3f3bd
#112763	f5be95bad0e8dabcf2406d3b18f1654cad1ef1dc
#111087	e3e78fb97032775f5fda92d798c72ad2887073b3

previous master: 1d67eba687

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-06-24T07:58:08Z

Finished benchmarking commit (e0ba2d0): comparison URL.

Overall result: ❌ regressions - 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.6%	[0.3%, 0.8%]	7
Regressions ❌ (secondary)	1.4%	[1.3%, 1.5%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[0.3%, 0.8%]	7

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)	-	-	0
Regressions ❌ (secondary)	2.0%	[0.9%, 2.8%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.8%	[-2.8%, -2.8%]	1
All ❌✅ (primary)	-	-	0

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.4%	[-6.6%, -4.5%]	6
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 661.747s -> 661.562s (-0.03%)

compiler-errors · 2023-06-24T08:23:46Z

testing perf in #112963 (comment)

lqd · 2023-06-24T09:27:29Z

Could also be some noise stabilizing, like the swing back around normal following #112891

compiler-errors · 2023-06-24T15:58:36Z

Ah, well #112963 also seems to reproduce the same regression. Not sure if it's noise or alternatively could also be the query cache shifting around a bit..

Anyways, #112963 is strictly more correct, so if it isn't noise then I don't think we should revert that and there's probably nothing to do to get the perf back easily.

Mark-Simulacrum · 2023-06-27T11:33:25Z

I think it's likely this is just noise.

ibraheemdev and others added 18 commits June 10, 2023 19:22

implement Sync for mpsc::Sender

5f56956

Bump compiler_builtins

70ce213

update failing ui tests

4ceca09

Stop bubbling out hidden types from the eval obligation queries

c996cfe

Don't emit same goal as input during wf obligations

f12695b

Resolve vars when reporting WF error

2eb7d69

Make sure to include default en-US ftl resources for rustc_error crate

0710040

Fix return type notation errors with -Zlower-impl-trait-in-trait-to-a…

d77e55b

…ssoc-ty

Fix associated type suggestion when -Zlower-impl-trait-in-trait-to-as…

6d99787

…soc-ty

Update cargo

4246e50

Rollup merge of rust-lang#112973 - compiler-errors:oops-forgot-ftl, r…

3148bcf

…=jyn514 Make sure to include default en-US ftl resources for `rustc_error` crate Fixes rust-lang#112928

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 24, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 24, 2023

bors merged commit e0ba2d0 into rust-lang:master Jun 24, 2023

rustbot added this to the 1.72.0 milestone Jun 24, 2023

bors mentioned this pull request Jun 24, 2023

Migrate TyCtxt::predicates_of and ParamEnv::caller_bounds to Clause #112938

Merged

4 tasks

rustbot added the perf-regression Performance regression. label Jun 24, 2023

Mark-Simulacrum removed the perf-regression Performance regression. label Jun 27, 2023

albertlarsan68 mentioned this pull request Jul 14, 2023

ICE when trait resolution defines opaque types #113689

Closed

compiler-errors deleted the rollup-6anskq1 branch August 11, 2023 20:16

glorv mentioned this pull request Sep 26, 2023

*: Revert "*: update rust-toolchain (#15584)" tikv/tikv#15683

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #112987

Rollup of 8 pull requests #112987

compiler-errors commented Jun 24, 2023

compiler-errors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

rust-timer commented Jun 24, 2023

rust-timer commented Jun 24, 2023

compiler-errors commented Jun 24, 2023

lqd commented Jun 24, 2023

compiler-errors commented Jun 24, 2023

Mark-Simulacrum commented Jun 27, 2023

Rollup of 8 pull requests #112987

Rollup of 8 pull requests #112987

Conversation

compiler-errors commented Jun 24, 2023

compiler-errors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

bors commented Jun 24, 2023

rust-timer commented Jun 24, 2023

rust-timer commented Jun 24, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

compiler-errors commented Jun 24, 2023

lqd commented Jun 24, 2023

compiler-errors commented Jun 24, 2023

Mark-Simulacrum commented Jun 27, 2023