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 9 pull requests #76153

Merged
merged 26 commits into from
Aug 31, 2020
Merged

Rollup of 9 pull requests #76153

merged 26 commits into from
Aug 31, 2020

Conversation

matklad
Copy link
Member

@matklad matklad commented Aug 31, 2020

Successful merges:

Failed merges:

r? @ghost

pickfire and 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.

Fixes rust-lang#66816
Keep doc standard for Vec DrainFilter

r? @jyn514
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
Member Author

matklad commented Aug 31, 2020

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

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

@rustbot rustbot added the rollup A PR which is a rollup label Aug 31, 2020
@bors
Copy link
Contributor

bors commented Aug 31, 2020

📌 Commit bd91b08 has been approved by matklad

@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 Aug 31, 2020
@bors
Copy link
Contributor

bors commented Aug 31, 2020

⌛ Testing commit bd91b08 with merge 3b4797c...

@bors
Copy link
Contributor

bors commented Aug 31, 2020

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

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

10 participants