Rollup of 30 pull requests #35666
Merged
Rollup of 30 pull requests #35666
Conversation
This file contains 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
E0248 Change in issue format E0267 UT New Format E0268 UT New Format E0267 & E0268 New Error Format
Most of these rely on spawning processes, which is not possible in Emscripten.
changed error text
I've been experiencing rust-lang#34978 with these two targets. This applies the hack in rust-lang#35178 to these targets as well.
…e more efficient tokenstream usages.
This issue rust-lang#35513 is a part of rust-lang#35233. r? @jonathandturner
The previous implementation of this function was overly conservative with liberal usage of `Option` and `.unwrap()` which in theory never triggers. This commit essentially removes the `Option`s in favor of unsafe implementations, improving the code generation of the fast path for LLVM to see through what's happening more clearly. cc rust-lang#34727
Similar to the `as_slice` method on `core::slice::Iter` struct.
The hidden find() functions always returns None. Consequently, one of the examples using find() prints "No file extension found" instead of "File extension: rs" which is the expected output. This patch fixes the issue by implementing find() with std::str::find(). Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
Fix subject-verb agreement in copypasta: "`AsRef` dereference" to "`AsRef` dereferences". Formalize "eg" to "e.g." Italicization of common Latin abbreviations seems to be going out of style in written English, so I left it plain.
…ts, r=jonathandturner Add label to E0254 This issue rust-lang#35513 is a part of rust-lang#35233. r? @jonathandturner
doc: a value of type `&str` is called a "string slice"
…labnik string: remove needless binding
Change stabilization version of no_std from 1.0 to 1.6. I don't know if more than this is needed. Fixes rust-lang#35579.
…atsakis
Improve &-ptr printing
This PR replaces printing `&-ptr` with a more readable description. To do so it uses a few heuristics.
If the name of the type is unknown, too long (longer than just saying "reference"), or too complex (a type with explicit lifetime annotations), it will instead opt to print either "reference" or "mutable reference", depending on the mutability of the type.
Before:
```
error[E0308]: mismatched types
--> src/test/compile-fail/issue-7061.rs:14:46
|
14 | fn foo(&'a mut self) -> Box<BarStruct> { self }
| ^^^^ expected box, found &-ptr
|
= note: expected type `Box<BarStruct>`
= note: found type `&'a mut BarStruct`
error: aborting due to previous error
```
After:
```
error[E0308]: mismatched types
--> src/test/compile-fail/issue-7061.rs:14:46
|
14 | fn foo(&'a mut self) -> Box<BarStruct> { self }
| ^^^^ expected box, found mutable reference
|
= note: expected type `Box<BarStruct>`
= note: found type `&'a mut BarStruct`
error: aborting due to previous error
```
… r=jonathandturner Update E0070 to new error format Updated E0070 to new error format. Part of rust-lang#35233 Fixes rust-lang#35503 Thanks for letting me help! r? @jonathandturner
… r=jonathandturner changed E0067 to new error format Updated E0067 to new error format. Part of rust-lang#35233 Fixes rust-lang#35502 Passes all the tests when running: `python src/bootstrap/bootstrap.py --step check-cfail --stage 1` **This seems strange, given that the format for E0067 has been changed.** It feels like it should fail some unit tests maybe? Let me know if I'm mistaken. Otherwise I can create a unit test for it. Thanks for letting me help! r? @jonathandturner
book: fix the hidden find() functions in error-handling.md The hidden find() functions always returns None. Consequently, one of the examples using find() prints "No file extension found" instead of "File extension: rs" which is the expected output. This patch fixes the issue by implementing find() with std::str::find(). Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
…r=apasel422 fix small typos in std::convert documentation Fix subject-verb agreement in copypasta: "`AsRef` dereference" to "`AsRef` dereferences". Formalize "eg" to "e.g." Italicization of common Latin abbreviations seems to be going out of style in written English, so I left it plain.
compiletest: Remove dead code.
…ormat, r=jonathandturner Update E0301 to the new format Part of rust-lang#35233. Fixes rust-lang#35522. r? @jonathandturner
…ormat, r=jonathandturner Update E0302 to the new format Part of rust-lang#35233. Fixes rust-lang#35523. r? @jonathandturner
E0094 error message updated Part of rust-lang#35233 Fixes rust-lang#35231 r? @jonathandturner
Ensure that attributes are spelled properly.
Predicates haven't existed in almost 5 years. This test probably adds negative value other than historical amusement.
Fix a couple of typos in RawVec Hi, The pull request is to fix a couple of typos in `liballoc/raw_vec.rs`. Regards, Ivan
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=1 |
|
📌 Commit bcee2ed has been approved by |
bors
added a commit
that referenced
this pull request
Aug 14, 2016
Rollup of 30 pull requests - Successful merges: #34941, #35392, #35444, #35447, #35491, #35533, #35539, #35558, #35573, #35574, #35577, #35586, #35588, #35594, #35596, #35597, #35598, #35606, #35611, #35615, #35616, #35620, #35622, #35640, #35643, #35644, #35646, #35647, #35648, #35661 - Failed merges: #35395, #35415
This was referenced Aug 15, 2016
Closed
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.
as_slice/as_mut_slicemethods onstd::vec::IntoIterstruct. #35447, Correct span for pub_restricted field #35491, Add regression test for #22894. #35533, Implemented a smarter TokenStream concatenation system #35539, Update error message for E0253 #35512 #35558, Update E0138 to new format #35573, Emscripten test fixes #35574, add -mrelax-relocations=no to i686-musl and i586-gnu #35577, E0248, E0267 & E0268 Change into issue format #35586, Use an existing constant name as an example. #35588, Allow compiling against a custom LLVM 3.9 installation #35594, Add label to E0254 #35596, doc: a value of type&stris called a "string slice" #35597, string: remove needless binding #35598, Change stabilization version of no_std from 1.0 to 1.6. #35606, Improve &-ptr printing #35611, Update E0070 to new error format #35615, changed E0067 to new error format #35616, book: fix the hidden find() functions in error-handling.md #35620, fix small typos in std::convert documentation #35622, compiletest: Remove dead code. #35640, Update E0301 to the new format #35643, Update E0302 to the new format #35644, E0094 error message updated #35646, Ensure that attributes are spelled properly. #35647, Predicates haven't existed in almost 5 years. #35648, Fix a couple of typos in RawVec #35661