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 6 pull requests #105261

Merged
merged 15 commits into from
Dec 4, 2022
Merged

Rollup of 6 pull requests #105261

merged 15 commits into from
Dec 4, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ohno418 and others added 15 commits December 3, 2022 23:24
Fix ICE on parsing an invalid variable declaration as a statement like:

```
macro_rules! m { ($s:stmt) => {} }
m! { var x }
```
Previously, the `recover_local_after_let` function was called from the
body of the `recover_stmt_local` function. Unifying these two functions
make it more simple and more readable.
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
This replaces ansi_term with yansi which in turn removes a winapi
dependency edge
This removes an autocfg dependency edge
This removes a lazy_static dependency edge
…errors

Suggest to use . instead of :: when accessing a method of an object

Fixes rust-lang#101749
Fixes rust-lang#101542
…l-in-macro-call, r=compiler-errors

Fix ICE on invalid variable declarations in macro calls

This fixes ICE that happens with invalid variable declarations in macro calls like:

```rust
macro_rules! m { ($s:stmt) => {} }
m! { var x }
m! { auto x }
m! { mut x }
```

Found this is because of not collecting tokens on recovery, so I changed to force collect them.

Fixes rust-lang#103529.
…errors

Properly substitute inherent associated types.

Fixes rust-lang#104240
…errors

Add regression test for rust-lang#47814

Closes rust-lang#47814
r? `@compiler-errors`

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
…errors

Use parent function WfCheckingContext to check RPITIT.

WF-check for RPITIT was done in the opaque type's param-env, so it could not benefit from assumed wf types from the function's parameters.

cc `@compiler-errors` since you chose that param-env in fd2766e

Fixes rust-lang#102682
Fixes rust-lang#104908
Fixes rust-lang#102552
Fixes rust-lang#104529
…n514

Update a couple of rustbuild deps

These mostly remove some dependency edges potentially making compilation of rustbuild itself a tiny bit faster. I hoped to be able to completely remove some dependencies, but other than replacing ansi_term with yansi all dependencies are still used.
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Dec 4, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Dec 4, 2022

📌 Commit d0335c3 has been approved by matthiaskrgr

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 Dec 4, 2022
@bors
Copy link
Contributor

bors commented Dec 4, 2022

⌛ Testing commit d0335c3 with merge 0f0d5d7...

@bors
Copy link
Contributor

bors commented Dec 4, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0f0d5d7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 4, 2022
@bors bors merged commit 0f0d5d7 into rust-lang:master Dec 4, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 4, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#105253 7c9eda3f6754759ff64b494d52bb5792c8ef5857
#105247 77c72cd9db50971ebaaccd12d59b7b6fdc9cd6d9
#105236 bfbbc49cfbc5318d866d90dcfe71859c6a414bfc
#105224 9437a2b1d6506adf0de980576b6d5343c49e7132
#105141 6444bded3ce4a0029192afbe4d28073a7d11ed07
#101975 c09045657971cfdfcec25706fe584461550a153e

previous master: 19c250aa12

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 (0f0d5d7): 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)

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

Cycles

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

@matthiaskrgr matthiaskrgr deleted the rollup-9ghhc9c branch December 22, 2022 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.

9 participants