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 5 pull requests #69424

Merged
merged 10 commits into from
Feb 24, 2020
Merged

Rollup of 5 pull requests #69424

merged 10 commits into from
Feb 24, 2020

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

ridiculousfish and 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 <[email protected]>
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 <[email protected]>

Update src/librustc_error_codes/error_codes/E0080.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0080.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0154.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0154.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0661.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0662.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0663.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0664.md

Co-Authored-By: varkor <[email protected]>

Update src/test/ui/json-short.stderr

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0260.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0154.md

Co-Authored-By: varkor <[email protected]>

Update src/librustc_error_codes/error_codes/E0260.md

Co-Authored-By: varkor <[email protected]>

Apply suggestions from code review

Co-Authored-By: varkor <[email protected]>

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.
@pietroalbini
Copy link
Member Author

@bors p=1100

Bypass the treeclosed.

@pietroalbini
Copy link
Member Author

@bors try

@pietroalbini
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Feb 24, 2020

📌 Commit ba3fee6 has been approved by pietroalbini

@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 Feb 24, 2020
@bors
Copy link
Contributor

bors commented Feb 24, 2020

⌛ Testing commit ba3fee6 with merge ff9231a9cf2adb0b616aee7250314f3263bf0b73...

@pietroalbini
Copy link
Member Author

@bors try-

@pietroalbini
Copy link
Member Author

@bors r-

@bors bors 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
@pietroalbini
Copy link
Member Author

@bors retry

@bors bors 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
@pietroalbini
Copy link
Member Author

@bors r+ p=1100

@bors
Copy link
Contributor

bors commented Feb 24, 2020

📌 Commit ba3fee6 has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Feb 24, 2020

⌛ Testing commit ba3fee6 with merge 9eee1528a08b2ce0ac3ca4ffe5813ec3b9e1b4b2...

@pietroalbini
Copy link
Member Author

@bors r- retry

RCS is not up to date.

@bors bors 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
@bors bors 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
@pietroalbini
Copy link
Member Author

@bors r+ p=1100

@bors
Copy link
Contributor

bors commented Feb 24, 2020

📌 Commit ba3fee6 has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Feb 24, 2020

⌛ Testing commit ba3fee6 with merge 1926a697a2d7e610bd0ca7363854f1bb38dc33cf...

@pietroalbini
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Feb 24, 2020

⌛ Testing commit ba3fee6 with merge d9a328a...

@pietroalbini
Copy link
Member Author

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Feb 24, 2020

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

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

7 participants