Skip to content

Rollup of 6 pull requests - #98359

Merged
bors merged 13 commits into
rust-lang:masterfrom
JohnTitor:rollup-v30vyzr
Jun 22, 2022
Merged

Rollup of 6 pull requests#98359
bors merged 13 commits into
rust-lang:masterfrom
JohnTitor:rollup-v30vyzr

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lcnrand others added 13 commits June 8, 2022 12:41
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
Arms are about TAIT and RPIT, as the variants clearly show.
lub: don't bail out due to empty binders
allows for the following to compile. The equivalent code using `struct Wrapper<'upper>(fn(&'upper ());` already compiles on stable.
```rust
let _: fn(&'upper ()) = match v {
true => lt_in_fn::<'a>(),
false => lt_in_fn::<'b>(),
};
```
see https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=7034a677190110941223cafac6632f70 for a complete example
r? ```@rust-lang/types```
…li-obk
interpret: convert_tag_add_extra: allow tagger to raise errors
Needed for rust-lang/miri#2234
r? `@oli-obk`
Move some tests to more reasonable directories
r? `@petrochenkov`
…rrors
Add a full regression test for rust-lang#73727Closesrust-lang#73727
This also moves a test to the `issues` directory as it's also tested on the adt_const_params feature.
r? ```@compiler-errors```
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
…t, r=GuillaumeGomez
Remove the unused-`#[doc(hidden)]` logic from the `unused_attributes` lint
Fixesrust-lang#96890.
It was found out that `#[doc(hidden)]` on trait impl items does indeed have an effect on the generated documentation (see the linked issue). In my opinion and the one of [others](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/Validy.20checks.20for.20.60.23.5Bdoc.28hidden.29.5D.60/near/281846219), rustdoc's output is actually a bit flawed in that regard but that should be tracked in a new issue I suppose (I will open an issue for that in the near future).
The check was introduced in rust-lang#96008 which is marked to be part of version `1.62` (current `beta`). As far as I understand, this means that **this PR needs to be backported** to `beta` to fixrust-lang#96890 on time. Correct me if I am wrong.
CC `@dtolnay` (in case you would like to agree or disagree with my decision to fully remove this check)
`@rustbot` label A-lint T-compiler T-rustdoc
r? `@rust-lang/compiler`
…t, r=oli-obk
This comment is out dated and misleading, the arm is about TAITs
r? ```@oli-obk```
```@oli-obk``` unsure if you want to add a different comment of some sort.
```@bors``` rollup=always
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 21, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Jun 21, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit cb3322a has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 21, 2022
@bors

bors commented Jun 22, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cb3322a with merge a09c668...

@bors

bors commented Jun 22, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing a09c668 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 22, 2022
@bors
bors merged commit a09c668 into rust-lang:masterJun 22, 2022
@rustbotrustbot added this to the 1.63.0 milestone Jun 22, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #98359!

Tested on commit a09c668.
Direct link to PR: #98359

💔 miri on windows: test-pass → build-fail (cc @RalfJung@eddyb@oli-obk).
💔 miri on linux: test-pass → build-fail (cc @RalfJung@eddyb@oli-obk).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 22, 2022
Tested on commit rust-lang/rust@a09c668.
Direct link to PR: <rust-lang/rust#98359>
💔 miri on windows: test-pass → build-fail (cc @RalfJung@eddyb@oli-obk).
💔 miri on linux: test-pass → build-fail (cc @RalfJung@eddyb@oli-obk).
@JohnTitor
JohnTitor deleted the rollup-v30vyzr branch June 22, 2022 03:01
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (a09c668): comparison url.

Instruction count

  • Primary benchmarks: mixed results
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions 😿
(primary)
0.8%1.0%6
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
-0.3%-0.6%14
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)0.0%1.0%20

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
-2.6%-2.6%1
Improvements 🎉
(secondary)
-3.3%-3.3%1
All 😿🎉 (primary)-2.6%-2.6%1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-2.3%-2.3%1
All 😿🎉 (primary)N/AN/A0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

@rustbotrustbot added the perf-regression Performance regression. label Jun 22, 2022
@rylev

rylev commented Jun 28, 2022

Copy link
Copy Markdown
Member

This is largely a wash as far as overall performance change. The regressions are contained to diesel. If I had to guess about a place to investigate, it would be #97867 (cc @lcnr), but it might not be worth the effort.

@rustbot label: +perf-regression-triaged

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.perf-regression-triagedThe performance regression has been triaged.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

11 participants

@JohnTitor@bors@rust-highfive@rust-timer@rylev@rustbot@lcnr@RalfJung@fmease@c410-f3r@spastorino