Skip to content

Rollup of 6 pull requests - #101333

Merged
bors merged 13 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-qpf1otj
Sep 2, 2022
Merged

Rollup of 6 pull requests#101333
bors merged 13 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-qpf1otj

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkovand others added 13 commits August 6, 2022 20:05
Before, the MIR validator used RevealAll in its ParamEnv for type
checking. This could cause false negatives in some cases due to
RevealAll ParamEnvs not always use all predicates as expected here.
Since some MIR passes like inlining use RevealAll as well, keep using
it in the MIR validator too, but when it fails usign RevealAll, also
try the check without it, to stop false negatives.
Before, it called `normalize_erasing_regions` twice since
`equal_up_to_regions` called it as well for both types.
This avoid unnecessarily getting the full reparse data when all we need is the tag.
This fixes rustdoc not showing the current version as stabilization version
for recently stabilized lang features.
… r=oli-obk
Try normalizing types without RevealAll in ParamEnv in MIR validation
Before, the MIR validator used RevealAll in its ParamEnv for type
checking. This could cause false negatives in some cases due to
RevealAll ParamEnvs not always use all predicates as expected here.
Since some MIR passes like inlining use RevealAll as well, keep using
it in the MIR validator too, but when it fails usign RevealAll, also
try the check without it, to stop false negatives.
Fixesrust-lang#99866
cc ````````@compiler-errors```````` who nicely helped me on zulip
…imulacrum
Change implementation of `-Z gcc-ld` and `lld-wrapper` again
This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixesrust-lang#97755.
…diagnostics, r=davidtwco
Porting 'compiler/rustc_trait_selection' to translatable diagnostics - Part 1
``@rustbot`` label +A-translation
r? rust-lang/diagnostics
cc rust-lang#100717
… r=Mark-Simulacrum
Also replace the version placeholder in rustc_attr
Replace the version placeholder with the current version in the rustc_attr crate too so that users won't see the placeholder but instead the explicit version. This especially fixes the bug for rustdoc not showing it but instead the placeholder.
Originally reported [here](https://rust-lang.zulipchat.com/#narrow/stream/241545-t-release/topic/libs.20stabilization.20placeholder/near/296057188).
cc rust-lang#100591
![Screenshot_20220830_233727](https://user-images.githubusercontent.com/8872119/187548079-6207776b-4481-4351-afff-607f5b3fe03a.png)
Use `FILE_ATTRIBUTE_TAG_INFO` to get reparse tag
I've been looking at this code recently and it just occurred to me we don't actually use the full reparse data at this point, only the tag. [`GetFileInformationByHandleEx`](https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-getfileinformationbyhandleex) can do exactly that by filling a [`FILE_ATTRIBUTE_TAG_INFO`](https://docs.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-file_attribute_tag_info) struct.
r? ```````@thomcc``````` since you've made changes here recently (which is why I have this code on my mind atm)
…r=notriddle
Remove unused .toggle-label CSS rule
It was added in rust-lang#44192 but since we moved to `<details>`, we don't use this rule any more.
r? `@notriddle`
@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Sep 2, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Sep 2, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e77b8ce has been approved by matthiaskrgr

It is now in the queue for this repository.

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

bors commented Sep 2, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e77b8ce with merge 9ba169a...

@bors

bors commented Sep 2, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 2, 2022
@bors
bors merged commit 9ba169a into rust-lang:masterSep 2, 2022
@rustbotrustbot added this to the 1.65.0 milestone Sep 2, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #101333!

Tested on commit 9ba169a.
Direct link to PR: #101333

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 2, 2022
Tested on commit rust-lang/rust@9ba169a.
Direct link to PR: <rust-lang/rust#101333>
💔 miri on windows: test-pass → test-fail (cc @oli-obk@RalfJung).
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#10132369ebb63296eedd375aa568ef606ae14555762d36
#10126010809bdb97abf913b485a24ab57c765d67ee3a4c
#1012153be0f69c3b68b50d469c75b44d45afb4c9cbf45c
#100814527b0bbe406f911399eab739ca12ec1f92029e6d
#1002009cb679aec678bf0a56a44fb56ee2bdff86968972
#1001210033deb2a7990f966a1faaa266145cb9e7875413

previous master: b88e510cc8

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

Finished benchmarking commit (9ba169a): 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.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-0.7%[-0.8%, -0.6%]6
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.

mean1rangecount2
Regressions ❌
(primary)
4.0%[1.2%, 6.8%]2
Regressions ❌
(secondary)
2.6%[2.6%, 2.6%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-3.6%[-3.8%, -3.4%]2
All ❌✅ (primary)4.0%[1.2%, 6.8%]2

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change2

  2. number of relevant changes2

@davidtwcodavidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
@matthiaskrgr
matthiaskrgr deleted the rollup-qpf1otj branch October 9, 2022 00:31
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.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-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

12 participants

@matthiaskrgr@bors@rust-highfive@rust-timer@davidtwco@rustbot@petrochenkov@Noratrieb@ChrisDenton@gabrielbusta@est31@GuillaumeGomez