Skip to content

Rollup of 8 pull requests - #83503

Merged
bors merged 19 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-mqvjfav
Mar 26, 2021
Merged

Rollup of 8 pull requests#83503
bors merged 19 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-mqvjfav

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Mark-Simulacrumand others added 19 commits March 24, 2021 12:04
Looks like I missed the lack of these "and"s.
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Which thus missed the point of the change: `rustdoc` already bundled documentation for methods accessible through one layer of `Deref`, it now has been enhanced to keep recursing 🙂
Fixesrust-lang#83469
We need to return an `Annotatable::Stmt` if we were passed an
`Annotatable::Stmt`
…doc, r=jyn514
[rustdoc] Don't document stripped items in JSON renderer.
Fixesrust-lang#80664, see [my comment there](rust-lang#80664 (comment)) for why
Note that we already do something similar in `convert_item`:
https://github.com/rust-lang/rust/blob/bb4cdf8ec034dca5c056ec9295f38062e5b7e871/src/librustdoc/json/conversions.rs#L28-L31
``@rustbot`` modify labels: +T-rustdoc +A-rustdoc-json
r? ``@jyn514``
cc ``@CraftSpider``
Refactor rust-lang#82270 as lint instead of an error
This PR fixes several issues with rust-lang#82270 which generated an error when `.intel_syntax` or `.att_syntax` was used in inline assembly:
- It is now a warn-by-default lint instead of an error.
- The lint only triggers on x86. `.intel_syntax` and `.att_syntax` are only valid on x86.
- The lint no longer provides machine-applicable suggestions for two reasons:
- These changes should not be made automatically since changes to assembly code can be very subtle.
- The template string is not always just a string: it can contain macro invocation (`concat!`), raw strings, escape characters, etc.
cc ``@asquared31415``
…ietroalbini
Fix bootstrap tests on beta
Forward-porting a fix from the beta branch, which led to test failure on beta.
r? ``@pietroalbini``
… r=kennytm
ExitStatusExt: Fix missing word in two docs messages
Looks like I missed the lack of these "and"s.
Fix patch note about rust-lang#80653 not mentioning nested nor recursive
Which thus missed the point of the change: `rustdoc` already bundled documentation for methods accessible through one layer of `Deref`, it has now been enhanced to keep recursing 🙂
r? ``@jyn514``
…=petrochenkov
Don't ICE when using `#[global_alloc]` on a non-item statement
Fixesrust-lang#83469
We need to return an `Annotatable::Stmt` if we were passed an
`Annotatable::Stmt`
@rustbotrustbot added the rollup A PR which is a rollup label Mar 26, 2021
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Mar 26, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit b0bec95 has been approved by Dylan-DPC

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

bors commented Mar 26, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b0bec95 with merge 7637fd5...

@bors

bors commented Mar 26, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 7637fd5 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2021
@bors
bors merged commit 7637fd5 into rust-lang:masterMar 26, 2021
@rustbotrustbot added this to the 1.53.0 milestone Mar 26, 2021
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

@Dylan-DPC-zz@bors@rustbot@Mark-Simulacrum@aDotInTheVoid@notriddle@ijackson@Amanieu@danielhenrymantilla@Aaron1011@Dylan-DPC