Skip to content

Rollup of 9 pull requests - #76153

Merged
bors merged 26 commits into
rust-lang:masterfrom
matklad:rollup-vlblfup
Aug 31, 2020
Merged

Rollup of 9 pull requests#76153
bors merged 26 commits into
rust-lang:masterfrom
matklad:rollup-vlblfup

Conversation

@matklad

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

pickfireand others added 26 commits August 28, 2020 19:33
reference counted pointer -> reference-counted pointer
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Passing --disable-per-crate-search removes the create search
inputs so moved code around so that the search input is enabled
first before the function returns
Clarify what the state of Vec after with_capacity on doc.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Added the `mingw-w64-x86_64-ninja` package to the build guide for MinGW, as well as a note not to use the `ninja` package from the `msys2` subsystem (doesn't handle paths correctly on windows).
Switch to intra-doc links in core/src/{convert,iter}/mod.rs
Partial fix for rust-lang#75080@rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc
r? @jyn514
couldn't fix these
```rust
../../std/string/struct.String.html
../../std/primitive.never.html
../../std/sync/mpsc/struct.TryIter.html
```
Add missing hyphen
reference counted pointer -> reference-counted pointer
@rustbot modify labels: T-doc
…ribute_before_return, r=GuillaumeGomez
rust-langGH-66816: Remove disable attr before return
Passing --disable-per-crate-search removes the create search inputs so moved code around so that the search input is enabled
first before the function returns.
Fixesrust-lang#66816
Use assertions on Vec doc
Clarify what the state of Vec after with_capacity on doc.
r? @jyn514
Use explicit intra-doc link in path for Vec resize
r? @jyn514
Update MinGW instructions to include ninja
Rust now requires `ninja` to build, so the MinGW build instructions are updated to reflect this.
Like for `python` and `cmake`, the `mingw-w64-x86_64-ninja` package should be used. The default package from the `msys2` subsystem doesn't handle paths correctly on windows.
@matklad

Copy link
Copy Markdown
ContributorAuthor

This is my first rollup, sorry if I messed up the procedure :D

@rustbot modify labels: +rollup
@bors r+ rollup=never p=9

@rustbotrustbot added the rollup A PR which is a rollup label Aug 31, 2020
@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit bd91b08 has been approved by matklad

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 31, 2020
@matkladmatklad mentioned this pull request Aug 31, 2020
@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bd91b08 with merge 3b4797c...

@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: matklad
Pushing 3b4797c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2020
@bors
bors merged commit 3b4797c into rust-lang:masterAug 31, 2020
@matklad
matklad deleted the rollup-vlblfup branch August 31, 2020 13:20
@cuvipercuviper added this to the 1.48.0 milestone Nov 17, 2023
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.

10 participants

@matklad@bors@cuviper@rustbot@pickfire@camelid@aszenz@nixphix@mark-i-m@CDirkx