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 6 pull requests #85664

Merged
merged 15 commits into from
May 25, 2021
Merged

Rollup of 6 pull requests #85664

merged 15 commits into from
May 25, 2021

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3 and others added 15 commits May 16, 2021 10:27
…docs

A few `[i32]`s are getting picked up as intra-doc links, rather than showing as slices, making the sentence quite confusing.
In commit 4b80687 (part of Rust 1.52.1)
many calls to `write!(w,` were replaced with `w.write_str(`, but this
one contained braces that were doubled to escape them when taken as a
format string, and so changing the call without changing the text caused
them to become doubled in the final HTML output.

I examined `print_item.rs` and the diff of that prior commit for any
other occurrences of this mistake and I did not find any.
…onicalize, r=jyn514

Use TargetTriple::from_path in rustdoc

This fixes the problem reported in Rust-for-Linux/linux#272 where rustdoc requires the absolute path of a target spec json instead of accepting a relative path like rustc.
…asper

Replace Local::new(1) with CAPTURE_STRUCT_LOCAL
…ve-css-dom, r=jsha

Move keyword primitive css dom

Fixes rust-lang#85569.

r? ``@jsha``
Better English for documenting when to use unimplemented!()

I don't think "plan of using" is correct here. I considered "plan on using" but eventually decided "plan to use" is better.
…jyn514

Add some backticks to the `rustc_middle::ty::adjustment::Adjustment` docs

A few `[i32]`s are getting picked up as intra-doc links, rather than showing as slices, making the sentence quite confusing.

See https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/adjustment/struct.Adjustment.html
Remove doubled braces in non_exhaustive structs’ documentation text.

In commit 4b80687 (part of Rust 1.52.1) many calls to `write!(w,` were replaced with `w.write_str(`, but this one contained braces that were doubled to escape them when taken as a format string, and so changing the call without changing the text caused them to become doubled in the final HTML output.

I examined `print_item.rs` and the diff of that prior commit for any other occurrences of this mistake and I did not find any.
@rustbot rustbot added the rollup A PR which is a rollup label May 25, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented May 25, 2021

📌 Commit afec726 has been approved by GuillaumeGomez

@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 May 25, 2021
@bors
Copy link
Contributor

bors commented May 25, 2021

⌛ Testing commit afec726 with merge fbf1b1a...

@bors
Copy link
Contributor

bors commented May 25, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 25, 2021
@bors bors merged commit fbf1b1a into rust-lang:master May 25, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 25, 2021
@GuillaumeGomez GuillaumeGomez deleted the rollup-o7qgo8c branch May 25, 2021 13:55
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants