Skip to content

Rollup of 6 pull requests - #87366

Merged
bors merged 17 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-7muueab
Jul 22, 2021
Merged

Rollup of 6 pull requests#87366
bors merged 17 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-7muueab

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

jackh726and others added 17 commits July 19, 2021 10:25
MSVC.
The LLVM limitation that previously prevented this has been fixed in LLVM
9 which is older than the oldest LLVM version we currently support.
See rust-lang#61002.
Removes the implementations that depend on the user-definable trait `Copy`.
Only fix regressions to ensure merge in 1.55: Does not modify `vec::IntoIter`.
In rust-lang#86157cd0f931
Use Tera templates for rustdoc.
dropped the following transformation from the keys of the default
settings element's `data-` attribute names:
.map(|(k, v)| format!(r#" data-{}="{}""#, k.replace('-', "_"), Escape(v)))
The `Escape` part is indeed no longer needed, because Tera does that
for us. But the massaging of `-` to `_` is needed, for the (bizarre)
reasons explained in the new comments.
I have tested that the default theme function works again for me. I
have also verified that passing
--default-theme="zork&"
escapes the value in the HTML.
Closesrust-lang#87263.
CC: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
…r=notriddle
Don't display <table> in item summary
Fixesrust-lang#87231.
r? `@notriddle`
Normalize generic_ty before checking if bound is met
Fixesrust-lang#81487
r? `@nikomatsakis`
…Gomez
rustdoc: Restore --default-theme, etc, by restoring varname escaping
In rust-lang#86157cd0f931
Use Tera templates for rustdoc.
dropped the following transformation from the keys of the default settings element's `data-` attribute names:
.map(|(k, v)| format!(r#" data-{}="{}""#, k.replace('-', "_"), Escape(v)))
The `Escape` part is indeed no longer needed, because Tera does that for us. But the massaging of `-` to `_` is needed, for the (bizarre) reasons explained in the new comments.
I have tested that the default theme function works again for me. I have also verified that passing (in shell syntax)
'--default-theme="zork&"'
escapes the value in the HTML.
Closesrust-lang#87263
…=nagisa
Allow combining -Cprofile-generate and -Cpanic=unwind when targeting MSVC.
The LLVM limitation that previously prevented this has been fixed in LLVM 9 which is older than the oldest LLVM version we currently support.
Fixesrust-lang#61002.
r? ``@nagisa`` (or anyone else from ``@rust-lang/wg-llvm)``
…on_only_regression_fix, r=cuviper
Regression fix to avoid further beta backports: Remove unsound TrustedRandomAccess implementations
Removes the implementations that depend on the user-definable trait `Copy`.
Only fix regressions to ensure merge in 1.55: Does not modify `vec::IntoIter`.
<hr>
This PR applies the beta-`1.53` backport rust-lang#86222 (merged as part of rust-lang#86225), a reduced version of rust-lang#85874 that only fixes regressions, to `master` in order to avoid the need for further backports from `1.55` onwards. Beta-`1.54` backport already happened with rust-lang#87136. In case that rust-lang#85874 gets merged quickly (within a week), this PR would be unnecessary.
r? `@cuviper`
Update my name/email in .mailmap
I should have done this years ago.
My name is also scattered across many other rust-lang repos, but none of the other repos I've looked at have a `.mailmap`. Is there any particular reason for this, or any process for updating my name/email everywhere?
@rustbotrustbot added the rollup A PR which is a rollup label Jul 22, 2021
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=6 rollup=never

@bors

bors commented Jul 22, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit ab9ea54 has been approved by GuillaumeGomez

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

bors commented Jul 22, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ab9ea54 with merge 1158367...

@bors

bors commented Jul 22, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 1158367 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2021
@bors
bors merged commit 1158367 into rust-lang:masterJul 22, 2021
@rustbotrustbot added this to the 1.55.0 milestone Jul 22, 2021
@GuillaumeGomez
GuillaumeGomez deleted the rollup-7muueab branch July 22, 2021 15:40
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@GuillaumeGomez@bors@rustbot@jackh726@michaelwoerister@steffahn@ijackson@lilyball