Rollup of 11 pull requests #35893
Closed
Rollup of 11 pull requests #35893
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Issue rust-lang#35799 as a part of issue rust-lang#35233 ?r jonathandturner
Fixes rust-lang#35797. Signed-off-by: Johannes Löthberg <[email protected]>
Based on following what happens in CString::new("string literal"):
1. Using `Into<Vec<u8>>`, a Vec is allocated with capacity exactly equal
to the string's input length.
2. By `v.push(0)`, the Vec is grown to twice capacity, since it was full.
3. By `v.into_boxed_slice()`, the Vec capacity is shrunk to fit the length again.
If we use `.reserve_exact(1)` just before the push, then we avoid the
capacity doubling that we're going to have to shrink anyway.
Growing by just 1 byte means that the step (2) is less likely to have to
move the memory to a larger allocation chunk, and that the step (3) does
not have to reallocate.
It used to say "Furtheremore" instead of "Furthermore".
This fixes rust-lang#35849, a regression introduced by the typeck refactoring around TyNever/!.
Update E0033 to the new error format Part of rust-lang#35233 Addresses rust-lang#35498 "r? @jonathandturner
…ndturner Improve Path and PathBuf docs r? @steveklabnik
…ndturner Err codes r? @jonathandturner
…urner New format for E0426 Issue rust-lang#35799 as a part of issue rust-lang#35233 r? jonathandturner
…Gomez Update E0424 to the new error format Fixes rust-lang#35797. Part of rust-lang#35233. r? @GuillaumeGomez
…umeGomez Indicate where `core::result::IntoIter` is created. None
…r=alexcrichton Check that executable file is in-tree before failing tidy check I silenced stdout and stderr for ls-files, not sure if that's appropriate (is `make tidy` intended to give debugging information)? Otherwise it prints each file it find to stdout/stderr, which currently prints nothing (only executable files are checked). I have not done major testing regarding the behavior of ls-files when the file is ignored, but judging by the man page everything should be fine. I've duplicated the code which makes the path git-friendly from the `Cargo.lock` checking code; I can extract that into a common helper if wanted (it's only two lines). Fixes rust-lang#35689.
cstring: avoid excessive growth just to 0-terminate
Based on following what happens in CString::new("string literal"):
1. Using `Into<Vec<u8>>`, a Vec is allocated with capacity exactly equal
to the string's input length.
2. By `v.push(0)`, the Vec is grown to twice capacity, since it was full.
3. By `v.into_boxed_slice()`, the Vec capacity is shrunk to fit the length again.
If we use `.reserve_exact(1)` just before the push, then we avoid the
capacity doubling that we're going to have to shrink anyway.
Growing by just 1 byte means that the step (2) is less likely to have to
move the memory to a larger allocation chunk, and that the step (3) does
not have to reallocate.
Addresses part of rust-lang#35838
Fix "Furthermore" Typo in String Docs It used to say "Furtheremore" instead of "Furthermore".
rustc: Fix outdated comment cc rust-lang#35870 (comment) r? @eddyb
typeck: use NoExpectation to check return type of diverging fn Fixes rust-lang#35849. Thanks @eddyb.
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=1 |
|
📌 Commit dd5137b has been approved by |
|
⌛ Testing commit dd5137b with merge aaad88b... |
|
💔 Test failed - auto-mac-64-opt |
|
Ughhh - and I did check that travis passed on each PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
core::result::IntoIteris created. #35845, Check that executable file is in-tree before failing tidy check #35848, cstring: avoid excessive growth just to 0-terminate #35871, Fix "Furthermore" Typo in String Docs #35879, rustc: Fix outdated comment #35882, typeck: use NoExpectation to check return type of diverging fn #35883