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 33 pull requests #35665

Closed
wants to merge 74 commits into from
Closed

Rollup of 33 pull requests #35665

wants to merge 74 commits into from

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Aug 14, 2016

Patrick McCann and others added 30 commits July 20, 2016 16:43
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.
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.
Didn't see this one at first.
Update E0138 to new format

Part of rust-lang#35233
Fix rust-lang#35510
r? @jonathandturner

![e0138](https://cloud.githubusercontent.com/assets/2716047/17562415/7200d93c-5f5d-11e6-98ff-e15c29f40e03.png)

Question: How can I only underline the function name ? I have observed the debug output and the struct of item, but I can't find the `Span` for function name. Should I modify the struct I get to save function name's position or there is another way to get it ? (I can only find `Span`s for function attributes, inputs, outputs, blocks)
Emscripten test fixes

This picks up parts of rust-lang#31623 to disable certain tests that emscripten can't run, as threads/processes are not supported.
I re-applied @tomaka's changes manually, I can rebase those commits with his credentials if he wants.

It also disables jemalloc for emscripten (at least in Rustbuild, I have to check if there is another setting for the same thing in the old makefile approach).

This should not impact anything for normal builds.
add -mrelax-relocations=no to i686-musl and i586-gnu

I've been experiencing rust-lang#34978 with these two targets. This applies the
hack in rust-lang#35178 to these targets as well.

r? @alexcrichton
…turner

E0248, E0267 & E0268 Change into issue format

r? @jonathandturner  Part of rust-lang#35391, rust-lang#35519 and rust-lang#35520. I have squashed all changes into a single commit. Please review the changes.

E0248 Change in issue format

E0267 UT New Format

E0268 UT New Format

E0267 & E0268 New Error Format
Use an existing constant name as an example.

By reading atomics documentation I tried to use `INIT_ATOMIC_BOOL`, which I couldn't find. Turns out it was renamed to `ATOMIC_BOOL_INIT`.
…xcrichton

Allow compiling against a custom LLVM 3.9 installation
…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"
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 <[email protected]>
…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.
…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
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
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@eddyb
Copy link
Member Author

eddyb commented Aug 14, 2016

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 14, 2016

📌 Commit d71e4e4 has been approved by eddyb

@eddyb eddyb closed this Aug 14, 2016
@eddyb eddyb deleted the rollup branch August 14, 2016 17:29
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.