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 11 pull requests #63990

Merged
merged 32 commits into from
Aug 29, 2019
Merged

Rollup of 11 pull requests #63990

merged 32 commits into from
Aug 29, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 29, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 30 commits August 22, 2019 10:15
remove the reference to __cxa_thread_atexit_impl
Since both functions are always unwrapped, don't wrap the return value
in an `Option`.
Correctly suggest adding bounds to `impl Trait` argument

Fix rust-lang#63706.
…ted, r=oli-obk

Resolve some small issues related to rust-lang#63580

This resolves some feedback left on rust-lang#63580 after it was merged:

- Adds documentation to `mir::Static` and `mir::StaticKind`
- Simplifies `maybe_get_optimized_mir()` and `maybe_get_promoted_mir()`

cc @bjorn3 @RalfJung
Recover `mut $pat` and other improvements

- Recover on e.g. `mut Foo(x, y)` and suggest `Foo(mut x, mut y)`. Fixes rust-lang#63764.
- Recover on e.g. `let mut mut x;`
- Recover on e.g. `let keyword` and `let keyword(...)`.
- Cleanups in `token.rs` with `fn is_non_raw_ident_where` and friends.
const_prop: only call error_to_const_error if we are actually showing something

This makes `RUSTC_CTFE_BACKTRACE` useful again.

r? @oli-obk

Fixes rust-lang#63439
…, r=estebank

Add Option<Span> to `require_lang_item`

Fixes rust-lang#63954

I'm not sure where to take `Some(span)` or something so I use `None` in many places.
r? @estebank
…michaelwoerister

Prevent syntax error in LD linker version script

As discussed in rust-lang#63925, there is an edge case in which an invalid LD version script is generated when building a `cdylib` with no exported symbols. This PR makes a slight modification to the  LD version script generation by first checking to see if any symbols need to be exported. If not, the `global` section of the linker script is simply omitted, and the syntax error is averted.
rustc_apfloat: make the crate #![no_std] explicitly.

We only need allocation, and even that could be made optional.
Notify me (flip1995) when Clippy toolstate changes

I want in on the fun 🎉

Also friendly ping @llogiq @mcarton: Since you two aren't _that_ active on the Clippy repo anymore, do you still want to get pinged on Clippy toolstate changes?

r? @oli-obk
add missing `#[repr(C)]` on the Slices union

Adds the `#[repr(C)]` attribute to the `Slices` union used to convert an `&str` into a `&[u8]`.
Without the attribute, the union has an unspecified layout: https://doc.rust-lang.org/reference/types/union.html, so performing the 'transmute' is unsound without the attribute (as far as I understand).

The `Repr` union, used for converting a raw ptr + len to a slice has this attribute as well:
https://github.com/rust-lang/rust/blob/master/src/libcore/ptr/mod.rs#L211-#L216
@Centril
Copy link
Contributor Author

Centril commented Aug 29, 2019

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Aug 29, 2019

📌 Commit 7391009 has been approved by Centril

@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 Aug 29, 2019
@bors
Copy link
Contributor

bors commented Aug 29, 2019

⌛ Testing commit 7391009 with merge 85ed538...

bors added a commit that referenced this pull request Aug 29, 2019
Rollup of 11 pull requests

Successful merges:

 - #63811 (Correctly suggest adding bounds to `impl Trait` argument)
 - #63933 (Resolve some small issues related to #63580)
 - #63938 (or-pattern: fix typo in error message)
 - #63945 (Recover `mut $pat` and other improvements)
 - #63958 (const_prop: only call error_to_const_error if we are actually showing something)
 - #63961 (Add Option<Span> to `require_lang_item`)
 - #63963 (remove the reference to __cxa_thread_atexit_impl)
 - #63965 (Prevent syntax error in LD linker version script)
 - #63968 (rustc_apfloat: make the crate #![no_std] explicitly.)
 - #63970 (Notify me (flip1995) when Clippy toolstate changes)
 - #63980 (add missing `#[repr(C)]` on the Slices union)

Failed merges:

 - #63989 (Add Yaah to clippy toolstain notification list)

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 29, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 85ed538 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 29, 2019
@bors bors merged commit 7391009 into rust-lang:master Aug 29, 2019
@Centril Centril deleted the rollup-q1nt0b0 branch August 29, 2019 08:48
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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. rollup A PR which is a rollup 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.

None yet