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 7 pull requests #103962

Merged
merged 19 commits into from
Nov 4, 2022
Merged

Rollup of 7 pull requests #103962

merged 19 commits into from
Nov 4, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 19 commits October 28, 2022 10:24
Fixed a typo that has been found on two locations in comments.
…times, r=jackh726

Fix late-bound lifetime closure ICEs in HIR typeck and MIR borrowck

During HIR typeck, we need to teach astconv to treat late-bound regions within a closure body as free, fixing escaping bound vars ICEs in both of the issues below.

However, this then gets us to MIR borrowck, which itself needs to be taught how to instantiate free region vids for late-bound regions that come from items that _aren't_ the typeck root (for now, just closures).

Fixes rust-lang#103771
Fixes rust-lang#103736
…aller, r=compiler-errors

Add track_caller to some Lock methods

Would have helped to diagnose rust-lang#103844.
…bility-ty, r=notriddle

Remove rustdoc clean::Visibility type

Fixes rust-lang#90852.

Follow-up of rust-lang#103690.

This PR completely removes the rustdoc `clean::Visibility` type to use the `rustc_middle` one instead. I don't think there will be any impact on perf.

r? `@notriddle`
Fixed typos

Fixed a typo that has been found on two locations in comments.
Fix ICE when negative impl is collected during eager mono

```rust
trait Foo {
    fn foo() {}
}

impl !Foo for () {}
```

This code will currently cause an ICE when mono collection mode is "eager" (with `-C link-dead-code=y` or `-Z print-mono-items=eager`.
…ow_unresolved_import_error, r=oli-obk

Remove unused argument from `throw_unresolved_import_error`

`throw_unresolved_import_error` does not need the second argument.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Nov 4, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Nov 4, 2022

📌 Commit 1edd63f 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 Nov 4, 2022
@bors
Copy link
Contributor

bors commented Nov 4, 2022

⌛ Testing commit 1edd63f with merge 6330c27...

@bors
Copy link
Contributor

bors commented Nov 4, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6330c27 to master...

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

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#103953 67335ed3def6d1aeaab9ddfbe9b741db7e58c8e8
#103950 ad4f18167de06dfa3252d8672bea7164bf7a7f2d
#103941 2be04f82b0db0969285ee5ec390194163e4524ad
#103935 80971a99f2a61585fcd982bcf3ad5516442ba753
#103845 89fcdcba9c547f7a10d5d222bb68028355011684
#103780 e0bb359118ef04d8ff0e035d1ca447eb1a83a963
#103680 c880d7f9f354b98c9217d26a2642f3498f1a6a8a

previous master: 47c008e440

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 (6330c27): 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.2% [-0.3%, -0.2%] 6
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.3%] 4
All ❌✅ (primary) -0.2% [-0.3%, -0.2%] 6

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)
1.4% [0.4%, 2.4%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-1.8%, -0.5%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.3% [-1.8%, 2.4%] 6

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.5% [0.4%, 0.6%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [-0.6%, 0.6%] 5

@matthiaskrgr matthiaskrgr deleted the rollup-9av8i6k 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
A-rustdoc-json Area: Rustdoc JSON backend 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.