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

Merged
merged 15 commits into from
Jan 10, 2022
Merged

Rollup of 7 pull requests #92719

merged 15 commits into from
Jan 10, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 15 commits December 24, 2021 01:41
Change from syntaxy-looking [src] to the plain word "source".
They were stabilized together with `Option::unwrap_unchecked`
in rust-lang#81383.

Signed-off-by: Miguel Ojeda <[email protected]>
Noted in rust-lang#87739 (review),
lang_items::extract no longer needs to take a closure.
…pointee, r=jackh726

Normalize struct tail type when checking Pointee trait

Let's go ahead and implement the FIXMEs by properly normalizing the struct-tail type when satisfying a Pointee obligation. This should fix the ICE when we try to calculate a layout depending on `<Ty as Pointee>::Metadata` later.
Fixes rust-lang#92128
Fixes rust-lang#92577

Additionally, mark the obligation as ambiguous if there are any infer types in that struct-tail type. This has the effect of causing `<_ as Pointee>::Metadata` to be properly replaced with an infer variable ([here](https://github.com/rust-lang/rust/blob/master/compiler/rustc_trait_selection/src/traits/project.rs#L813)) and registered as an obligation... this turns out to be very important in unifying function parameters with formals that are assoc types.

Fixes rust-lang#91446
…line-removal, r=camelid

Fix invalid removal of newlines from doc comments

Fixes rust-lang#91201.

Before:

![Screenshot from 2021-12-28 17-02-11](https://user-images.githubusercontent.com/3050060/147585187-c8e67531-c1b4-457d-9d30-d5b44bf91fea.png)

After:

![Screenshot from 2021-12-28 17-02-25](https://user-images.githubusercontent.com/3050060/147585190-30aa0398-1fc7-4fe7-9e8b-5c475d4f9613.png)

r? `@camelid`
Make source links look cleaner

Change from syntaxy-looking [src] to the plain word "source".

Change the syntaxy-looking `[-]` at the top of the page to say "collapse".

Reduce opacity of rightside content.

Part of rust-lang#59851

r? `@GuillaumeGomez`

Demo: https://rustdoc.crud.net/jsha/source-link-2/std/string/struct.String.html

[Discussed on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/display.20of.20source.20link).
…-const-expr, r=oli-obk

Normalize generator-local types with unevaluated constants

Normalize generator-interior types in addition to (i.e. instead of just) erasing regions, since sometimes we collect types with unevaluated const exprs.

Fixes rust-lang#84737
Fixes rust-lang#88171
Fixes rust-lang#92091
Fixes rust-lang#92634
Probably also fixes rust-lang#73114, but that one has no code I could test. It looks like it's the same issue, though.
Release notes: add `Result::unwrap_{,err_}unchecked`

They were stabilized together with `Option::unwrap_unchecked`
in rust-lang#81383.

Signed-off-by: Miguel Ojeda <[email protected]>
…etrochenkov

Clean up lang_items::extract

Noted in rust-lang#87739 (review),
lang_items::extract no longer needs to take a closure.
@rustbot rustbot added T-compiler Relevant to the compiler 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 Jan 10, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jan 10, 2022

📌 Commit 3d5db0e has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 10, 2022
@bors
Copy link
Contributor

bors commented Jan 10, 2022

⌛ Testing commit 3d5db0e with merge 89b9f7b...

@bors
Copy link
Contributor

bors commented Jan 10, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 10, 2022
@bors bors merged commit 89b9f7b into rust-lang:master Jan 10, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 10, 2022
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #92719!

Tested on commit 89b9f7b.
Direct link to PR: #92719

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 10, 2022
Tested on commit rust-lang/rust@89b9f7b.
Direct link to PR: <rust-lang/rust#92719>

🎉 miri on windows: build-fail → test-pass (cc @RalfJung @oli-obk @eddyb).
🎉 miri on linux: build-fail → test-pass (cc @RalfJung @oli-obk @eddyb).
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89b9f7b): comparison url.

Summary: This change led to large relevant improvements 🎉 in compiler performance.

  • Large improvement in instruction counts (up to -1.2% on full builds of keccak)

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

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-tc7oqys branch February 13, 2022 00:53
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-compiler Relevant to the compiler 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.