Skip to content

Rollup of 5 pull requests - #87351

Merged
bors merged 12 commits into
rust-lang:masterfrom
ehuss:rollup-pga85az
Jul 21, 2021
Merged

Rollup of 5 pull requests#87351
bors merged 12 commits into
rust-lang:masterfrom
ehuss:rollup-pga85az

Conversation

@ehuss

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

weihangloand others added 12 commits July 11, 2021 10:50
Since this is an example, this could really do with some review from
someone familiar with unsafe stuff !
I made the example no longer `no_run` since it works for me.
Fixesrust-lang#81847
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Alignments > 4k are not supported,
rust-lang#70022rust-lang#70144
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
…nieu
docs: GlobalAlloc: completely replace example with one that works
Since this is an example, this could really do with some review from someone familiar with unsafe stuff!
I made the example no longer `no_run` since it works for me.
Fixesrust-lang#81847
rustdoc: show count of item contents when hidden
Resolvesrust-lang#85494
Update cargo
6 commits in 27277d966b3cfa454d6dea7f724cb961c036251c..4e143fd131e0c16cefd008456e974236ca54e62e
2021-07-16 00:50:39 +0000 to 2021-07-20 21:55:45 +0000
- Named profile updates (rust-lang/cargo#9685)
- Inform build scripts of rustc compiler context (rust-lang/cargo#9601)
- Factor version preferences into a struct (rust-lang/cargo#9703)
- docs: Fix sentence & update link for GitLab CI docs (rust-lang/cargo#9704)
- Deduplicate compiler diagnostics. (rust-lang/cargo#9675)
- Re-enable future-incompatible tests. (rust-lang/cargo#9698)
…akis
Rename force-warns to force-warn
The renames the `--force-warns` option to `--force-warn`. This mirrors other lint options like `--warn` and `--deny` which are in the singular.
r? `@nikomatsakis`
cc `@ehuss` - this option is being used by Cargo. How do we make sure the transition to using the new name is as smooth as possible?
@rustbotrustbot added the rollup A PR which is a rollup label Jul 21, 2021
@ehuss

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=5

@bors

bors commented Jul 21, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 43e2575 has been approved by ehuss

@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 21, 2021
@bors

bors commented Jul 21, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 43e2575 with merge 32c9b7b...

@bors

bors commented Jul 21, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 32c9b7b to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 21, 2021
@bors
bors merged commit 32c9b7b into rust-lang:masterJul 21, 2021
@rustbotrustbot added this to the 1.55.0 milestone Jul 21, 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.

7 participants

@ehuss@bors@rustbot@weihanglo@lnicola@ijackson@rylev