Skip to content

Rollup of 5 pull requests - #75765

Merged
bors merged 12 commits into
rust-lang:masterfrom
JohnTitor:rollup-lexaoa9
Aug 21, 2020
Merged

Rollup of 5 pull requests#75765
bors merged 12 commits into
rust-lang:masterfrom
JohnTitor:rollup-lexaoa9

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

ericseppanenand others added 12 commits August 8, 2020 22:50
remove_dir will error if the path doesn't exist or isn't a directory.
It's useful to clarify that this is "remove dir or fail" not "remove dir
if it exists".
I don't think this belongs in the title. "Removes an existing, empty
directory" is strangely worded-- there's no such thing as a non-existing
directory. Better to just say explicitly it will return an error.
Use two printlns when testing that writing to a closed stdout does not
panic. Otherwise the test is ineffective, since the current implementation
silently ignores the error during first println regardless.
Can't link from `core` to `std` yet.
One of the original links was linking to the wrong thing as well.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
clarify documentation of remove_dir errors
remove_dir will error if the path doesn't exist or isn't a directory.
It's useful to clarify that this is "remove dir or fail" not "remove dir
if it exists".
I don't think this belongs in the title. "Removes an existing, empty
directory" is strangely worded-- there's no such thing as a non-existing
directory. Better to just say explicitly it will return an error.
Fix RFC-1014 test
Use two printlns when testing that writing to a closed stdout does not
panic. Otherwise the test is ineffective, since the current implementation
silently ignores the error during first println regardless.
…sult, r=jyn514
Switch to intra-doc links in `core::result`
Part of rust-lang#75080.
@rustbot modify labels: A-intra-doc-links T-doc T-rustdoc
…, r=jyn514
Move to intra doc links for std::thread documentation
Helps with rust-lang#75080.
@rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc
r? @jyn514
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

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

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

bors commented Aug 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 2a7f868 has been approved by JohnTitor

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

bors commented Aug 21, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2a7f868 with merge 32cb8d4...

@bors

bors commented Aug 21, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: JohnTitor
Pushing 32cb8d4 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2020
@bors
bors merged commit 32cb8d4 into rust-lang:masterAug 21, 2020
@JohnTitor
JohnTitor deleted the rollup-lexaoa9 branch August 21, 2020 11:12
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
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.

9 participants

@JohnTitor@bors@cuviper@rustbot@ericseppanen@tmiasko@mati865@camelid@poliorcetics