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 #114756

Merged
merged 20 commits into from
Aug 12, 2023
Merged

Rollup of 7 pull requests #114756

merged 20 commits into from
Aug 12, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

darklyspaced and others added 20 commits August 7, 2023 22:10
Display actual vars instead of two dots.

The same was done for Args and ArgsOs in 275f9a0.
…joshtriplett

Partially stabilize `int_roundings`

This stabilizes the following:

```rust
impl uX {
    pub const fn div_ceil(self, rhs: Self) -> Self;
    pub const fn next_multiple_of(self, rhs: Self) -> Self;
    pub const fn checked_next_multiple_of(self, rhs: Self) -> Option<Self>;
}
```

This feature is tracked in rust-lang#88581.
…manieu

Better Debug for Vars and VarsOs

Display actual vars instead of two dots.

The same was done for Args and ArgsOs in 275f9a0.
…vidtwco

Record binder for bare trait object in LifetimeCollectVisitor

The `LifetimeCollectVisitor` had a bug where it was not recording the binder of bate trait objects. This was uncovered in rust-lang#114487, when I changed opaque type lowering to ICE if it encountered a captured fresh lifetime with no def-id to map back to: https://github.com/rust-lang/rust/pull/114487/files#diff-ad0c15bbde97a607d4758ec7eaf88248be5d6b8ae084dfc84127f81e3f7a9bb4R1585

Fixes rust-lang#114664
…strieb

downgrade `internal_features` to warn

Not sure if this requires an FCP or whatever. By having the lint as deny I need to modify test cases when testing them outside of the test suite as the test suite implicitly allows the lint. This takes maybe 10 to 20 seconds per test, but given just how frequently I end up copying tests to different repos it's a significant annoyance.

r? `@Nilstrieb`
Cover ParamConst in smir

Others variants won't be useful for a while or ever(?), but we might need this one.

r? ````@oli-obk````
@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 12, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Aug 12, 2023

📌 Commit cf9081c 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 Aug 12, 2023
@bors
Copy link
Contributor

bors commented Aug 12, 2023

⌛ Testing commit cf9081c with merge 1d8dfea8527709ed9061a686ca2c0a7b9dd20f64...

@bors
Copy link
Contributor

bors commented Aug 12, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 1d8dfea8527709ed9061a686ca2c0a7b9dd20f64 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 12, 2023
@bors
Copy link
Contributor

bors commented Aug 12, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@matthiaskrgr
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Aug 12, 2023

⌛ Testing commit cf9081c with merge cbb48a5...

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1d8dfea8527709ed9061a686ca2c0a7b9dd20f64): comparison URL.

Overall result: ❌ regressions - 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.4% [0.4%, 0.4%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
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.0% [0.0%, 0.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 1

Cycles

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

Binary size

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

Bootstrap: 632.009s -> 631.601s (-0.06%)

@bors
Copy link
Contributor

bors commented Aug 12, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Aug 12, 2023

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

@bors bors merged commit cbb48a5 into rust-lang:master Aug 12, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 12, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#94455 Partially stabilize int_roundings f757d623b14d558103ec73d8bbadc4be8d274d48 (link)
#114132 Better Debug for Vars and VarsOs c0d3a6388f65a44037c19e2056690920a0bc3df5 (link)
#114584 E0277 nolonger points at phantom .await 889c9aee028a8546ae471879f920969d0098fd02 (link)
#114667 Record binder for bare trait object in LifetimeCollectVisit… f46fff8c5a59bb6c01aaa64a8f7d8a4f50000f1f (link)
#114692 downgrade internal_features to warn 4dd2fd99a96416736397db76fce8333ab7f3bda0 (link)
#114703 Cover ParamConst in smir a7a761b2c4d2145937ab43ef88e53e2ab8f91702 (link)
#114734 Mark oli as "on vacation" f9af429b805192d40c04e57fa90d62cb41a67587 (link)

previous master: 1e836d12d3

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 (cbb48a5): 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)

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.5% [2.5%, 2.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-2.7%, -2.7%] 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)
-3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 632.609s -> 634.075s (0.23%)

@matthiaskrgr matthiaskrgr deleted the rollup-4m7l4p6 branch March 16, 2024 18:18
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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.