Skip to content

Rollup of 8 pull requests - #91064

Merged
bors merged 20 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-2ijidpt
Nov 20, 2021
Merged

Rollup of 8 pull requests#91064
bors merged 20 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-2ijidpt

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkinand others added 20 commits October 10, 2021 14:03
- Make clear that the `Pointer` trait is related to formatting
- Make clear that `&T` (shared reference) implements `Send` (if `T: Send + Sync`)
Co-authored-by: fmease <liehr.exchange@gmx.net>
Use h3 and h4 for the variant name and the "Fields" subheading.
Remove the "of T" part of the "Fields" subheading.
Remove border-bottom from "Fields" subheading.
Move docblock below "Fields" listing.
The basic problem with this is that rustdoc, when hunting for `fn main`, will stop
parsing after it reaches a fatal error. This unexpected semicolon was a fatal error,
so in `src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs`, it would wrap
the doctest in an implied main function, turning it into this:
fn main() {
struct S {};
fn main() {
assert_eq!(0, 1);
}
}
This, as it turns out, is totally valid, and it executes no assertions, so *it passes,*
even though the user wanted it to execute the assertion.
The Rust parser already has the ability to recover from these unexpected semicolons,
but to do so, it needs to use the `parse_mod` function, so this commit changes it to do that.
They were being interpreted literally.
Makes docs for references a little less confusing
- Make clear that the `Pointer` trait is related to formatting
- Make clear that the `Pointer` trait is implemented for references (previously it was confusing to first see that it's implemented and then see it in "expect")
- Make clear that `&T` (shared reference) implements `Send` (if `T: Send + Sync`)
…d,GuillaumeGomez
Improve display of enum variants
Use h3 and h4 for the variant name and the "Fields" subheading.
Remove the "of T" part of the "Fields" subheading.
Remove border-bottom from "Fields" subheading.
Move docblock below "Fields" listing.
Fixesrust-lang#90061
Demo:
https://jacob.hoffman-andrews.com/rust/xmlparser-updated/xmlparser/enum.Token.html#variantshttps://jacob.hoffman-andrews.com/rust/fix-enum-variants/std/io/enum.ErrorKind.html#variantshttps://jacob.hoffman-andrews.com/rust/fix-enum-variants/std/result/enum.Result.html#variants
r? ``@camelid``
fix CTFE/Miri simd_insert/extract on array-style repr(simd) types
The changed test would previously fail since `place_index` would just return the only field of `f32x4`, i.e., the array -- rather than *indexing into* the array which is what we have to do.
The new helper methods will also be needed for rust-lang/miri#1912.
r? ``````@oli-obk``````
…-semicolon, r=jyn514
rustdoc doctest: detect `fn main` after an unexpected semicolon
Fixesrust-lang#91014
The basic problem with this is that rustdoc, when hunting for `fn main`, will stop parsing after it reaches a fatal error. This unexpected semicolon was a fatal error, so in `src/test/rustdoc-ui/failed-doctest-extra-semicolon-on-item.rs`, it would wrap the doctest in an implied main function, turning it into this:
fn main() {
struct S {};
fn main() {
assert_eq!(0, 1);
}
}
This, as it turns out, is totally valid, and it executes no assertions, so *it passes,* even though the user wanted it to execute the assertion.
The Rust parser already has the ability to recover from these unexpected semicolons, but to do so, it needs to use the `parse_mod` function, so this PR changes it to do that.
…ty-line, r=camelid
Put back removed empty line
Fixes comment from rust-lang#90438 (comment).
r? ````@camelid````
Turn all 0x1b_u8 into '\x1b' or b'\x1b'
Supersedes rust-lang#91040
rustdoc: Fix some unescaped HTML tags in docs
They were being interpreted literally.
@rustbotrustbot added the rollup A PR which is a rollup label Nov 20, 2021
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=8

@bors

bors commented Nov 20, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 54bc333 has been approved by matthiaskrgr

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

bors commented Nov 20, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 54bc333 with merge 3b65165...

@bors

bors commented Nov 20, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2021
@bors
bors merged commit 3b65165 into rust-lang:masterNov 20, 2021
@rustbotrustbot added this to the 1.58.0 milestone Nov 20, 2021
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (3b65165): comparison url.

Summary: This benchmark run did not return any relevant changes.

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

@rustbot label: -perf-regression

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.

11 participants

@matthiaskrgr@bors@rust-timer@rustbot@WaffleLapkin@jsha@JohnTitor@RalfJung@notriddle@GuillaumeGomez@camelid