Skip to content

Rollup of 5 pull requests - #69424

Merged
bors merged 10 commits into
rust-lang:masterfrom
emilyalbini:rollup-3oelogm
Feb 24, 2020
Merged

Rollup of 5 pull requests#69424
bors merged 10 commits into
rust-lang:masterfrom
emilyalbini:rollup-3oelogm

Conversation

@emilyalbini

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

ridiculousfishand others added 10 commits February 22, 2020 13:30
Prior to this commit, `str` documented that `get_unchecked` had
the precondition that "`begin` must come before `end`". This would appear
to prohibit empty slices (i.e. begin == end).
In practice, get_unchecked is called often with empty slices. Let's relax
the precondition so as to allow them.
Suggested by @ametisf in rust-lang#65948 (comment)
Co-Authored-By: Frantisek Fladung <fladufra@fel.cvut.cz>
Formatting fixes
Now that I can actually run `python x.py test src/tools/tidy` locally
... my god it takes a long time to compile when you're on a cellular
connection.
Removing unnecessary whitespaces
Updates src/test/ui/json-short.stderr golden test file
Fixes test failure by updating the golden file for changes
in src/librustc_error_codes/error_codes/E0601.md
Update src/librustc_error_codes/error_codes/E0080.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0080.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0080.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0154.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0154.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0661.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0662.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0663.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0664.md
Co-Authored-By: varkor <github@varkor.com>
Update src/test/ui/json-short.stderr
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0260.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0154.md
Co-Authored-By: varkor <github@varkor.com>
Update src/librustc_error_codes/error_codes/E0260.md
Co-Authored-By: varkor <github@varkor.com>
Apply suggestions from code review
Co-Authored-By: varkor <github@varkor.com>
Fixing 1 character over 80 cascade
Updates links in various Compiler Error Index entries
Currently many of the links in the online https://doc.rust-lang.org/error-index.html are not clickable, and many of them don't resolve correctly as they point to older versions of rustbyexample and the reference.
… r=nagisa
Relax str::get_unchecked precondition to permit empty slicing
Prior to this commit, `str` documented that `get_unchecked` had
the precondition that "`begin` must come before `end`". This would appear
to prohibit empty slices (i.e. begin == end).
In practice, get_unchecked is called often with empty slices. Let's relax
the precondition so as to allow them.
…cs_replace_chunk_with_windows, r=Dylan-DPC
Fix minor error in `MaybeUninit::get_mut()` doc example
In the `MaybeUninit::get_mut()` example I wanted to assert that the slice was sorted and mistakenly used `.chunks(2)` rather than `.windows(2)` to assert it, as @ametisf pointed out in rust-lang#65948 (comment) .
This fixes it.
…=joshtriplett
docs: Stdin::read_line: mention the appending
The fact that `stdin().read_line()` is an [unpleasant](https://twitter.com/Michcioperz/status/1231646797661167617?s=20) [footgun](https://rustbattle.net/battle/straight-finch-8-e4f4). Let's make it clearer in the documentation.
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors p=1100

Bypass the treeclosed.

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors try

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r+

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ba3fee6 has been approved by pietroalbini

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

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ba3fee6 with merge ff9231a9cf2adb0b616aee7250314f3263bf0b73...

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors try-

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 24, 2020
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 24, 2020
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=1100

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ba3fee6 has been approved by pietroalbini

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ba3fee6 with merge 9eee1528a08b2ce0ac3ca4ffe5813ec3b9e1b4b2...

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r- retry

RCS is not up to date.

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 24, 2020
@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 24, 2020
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=1100

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ba3fee6 has been approved by pietroalbini

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ba3fee6 with merge 1926a697a2d7e610bd0ca7363854f1bb38dc33cf...

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors retry

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ba3fee6 with merge d9a328a...

@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors treeclosed-

@bors

bors commented Feb 24, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing d9a328a to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 24, 2020
@bors
bors merged commit d9a328a into rust-lang:masterFeb 24, 2020
@emilyalbini
emilyalbini deleted the rollup-3oelogm branch December 23, 2020 23:00
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.S-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

@emilyalbini@bors@ridiculousfish@danielhenrymantilla@GuillaumeGomez@yawpitch@meithecatte