Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #113474

Merged
merged 17 commits into from
Jul 8, 2023
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nbdd0121 and others added 17 commits June 30, 2023 18:38
…, r=fee1-dead

Don't ICE in `resolve_bound_vars` when associated return-type bounds are in bad positions

I couldn't find a better way to avoid hitting this ICE, so let's just delay it.

The problem is that we really shouldn't even be *trying* to visit associated type bounds in `resolve_bound_vars` when they show up in impl headers, but we don't have enough context to do this.

Fixes rust-lang#113423
…itit-gat, r=spastorino

Remove `variances_of` on RPITIT GATs, remove its one use-case

It doesn't make sense to implement variances on a GAT anyways, since we don't relate GATs with variance:

https://github.com/rust-lang/rust/blob/85bf07972a1041b9e25393b803d0e006bec3eaaf/compiler/rustc_middle/src/ty/relate.rs#L569-L579

r? ``@spastorino``
miri: check that assignments do not self-overlap

r? `````@oli-obk`````
…er-errors

Remove unused from_method from rustc_on_unimplemented

Fixes rust-lang#113439

`on_unimplemented_note` was calling `item_name` for RPITITs and that produced ICEs. I've added a regression test for that but also have removed `from_method` symbol entirely because it wasn't even used and by doing that the `item_name` call was also removed.

r? ``@compiler-errors``
…er-errors

Avoid calling report_forbidden_specialization for RPITITs

Fixes rust-lang#113438

r? ``@compiler-errors``
Update cargo

1 commits in 5b377cece0e0dd0af686cf53ce4637d5d85c2a10..45782b6b8afd1da042d45c2daeec9c0744f72cc7
2023-06-30 00:01:00 +0000 to 2023-07-05 16:54:51 +0000
- docs(ref): Provide guidance on version requirements (rust-lang/cargo#12323)

r? ``@ghost``
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Jul 8, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jul 8, 2023

📌 Commit 7a22c7e has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Jul 8, 2023
@bors
Copy link
Contributor

bors commented Jul 8, 2023

⌛ Testing commit 7a22c7e with merge 99ebfe3778dd0d2bcae8c7dc023025a305a177bd...

@bors
Copy link
Contributor

bors commented Jul 8, 2023

💥 Test timed out

@bors 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 Jul 8, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@bors
Copy link
Contributor

bors commented Jul 8, 2023

⌛ Testing commit 7a22c7e with merge ce519c5...

@bors
Copy link
Contributor

bors commented Jul 8, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Jul 8, 2023

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

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Jul 8, 2023
@bors bors merged commit ce519c5 into rust-lang:master Jul 8, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jul 8, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#113413 Add needs-triage to all new issues d7879b5e9ea1d1027d344cb18582f0609826bc9e (link)
#113426 Don't ICE in resolve_bound_vars when associated return-ty… 1ccfce88e7adf2827a082dccab224ba1e456ca2c (link)
#113427 Remove variances_of on RPITIT GATs, remove its one use-ca… 2e630c817a8655bac9a04a7428e164a46b381438 (link)
#113441 miri: check that assignments do not self-overlap e05a2add63de7c7d34492fbd65875f685ad34b9e (link)
#113453 Remove unused from_method from rustc_on_unimplemented f1c3e7158d2b8eb0c5254c2d6ccc280037808b00 (link)
#113456 Avoid calling report_forbidden_specialization for RPITITs 3563a8f15877bf7e6532c8095f9f8e309b3456cb (link)
#113466 Update cargo 69b99a9a86297afc0425d7c963a097ff4a1ff9c9 (link)
#113467 Fix comment of fn_can_unwind 1c42ffa43298c95a392fcab2ecd84d4764e65c18 (link)

previous master: d4096e0412

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
Copy link
Collaborator

Finished benchmarking commit (ce519c5): 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.6% [-1.7%, -1.5%] 4
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)
- - 0
Regressions ❌
(secondary)
5.4% [5.4%, 5.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.6% [-1.6%, -1.6%] 2
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)
-1.1% [-1.5%, -0.8%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.1% [-1.5%, -0.8%] 5

Binary size

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

Bootstrap: 656.508s -> 655.094s (-0.22%)

@compiler-errors compiler-errors deleted the rollup-07x1up7 branch August 11, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants