Skip to content

Rollup of 11 pull requests - #53449

Merged
bors merged 29 commits into
rust-lang:masterfrom
frewsxcv:rollup
Aug 17, 2018
Merged

Rollup of 11 pull requests#53449
bors merged 29 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

@frewsxcv

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

alexcrichtonand others added 29 commits August 13, 2018 18:03
by strengthening the tests there.
In almost all cases the strengthening amount to just encoding a use
that models the original lexical lifetime. A more invasive revision
was made in one case where it seems the actual issue is MIR-borrowck's
greater "knowledge" of unreachable code in the control flow...
by strengthening the tests (by adding no-op references to the
closures doing the borrows after the conflicting borrows, thus
forcing the lifetimes to resemble lexical scopes even under NLL).
Originally added in rust-lang#52887 this commit disables passing `--strip-debug` to LLD
when optimized. This bring back the original bug of emitting broken debuginfo
but currently it *also* strips the `name` section which makes it very difficult
to inspect the final binary. A real fix is happening at
https://reviews.llvm.org/D50729 and we can reevaluate once we've updated LLD to
have that commit.
…onSapin
Implement Iterator::size_hint for Elaborator.
None
…=nikomatsakis
Fix usage of `wasm_target_feature`
Currently usage results in:
```
error: internal compiler error: librustc_typeck/collect.rs:1928: unknown target feature gate wasm_target_feature
thread 'main' panicked at 'Box<Any>', librustc_errors/lib.rs:579:9
note: Run with `RUST_BACKTRACE=1` for a backtrace.
error: aborting due to previous error
note: the compiler unexpectedly panicked. this is a bug.
note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
note: rustc 1.30.0-nightly (d5a448b 2018-08-13) running on x86_64-unknown-linux-gnu
note: compiler flags: -C debuginfo=2 -C linker=/tmp/lld-shim -C incremental --crate-type lib
note: some of the compiler flags provided by cargo are hidden
error: Could not compile `coresimd`.
To learn more, run the command again with --verbose.
```
and hopefully this should fix the ICE!
…omatsakis
[nll] add regression test for issue rust-lang#27868
Adds a test for rust-lang#27868 ``Inconsistent evaluation order for assignment operations``
apart of rust-lang#47366 ``tracking issue for bugs fixed by the MIR borrow checker or NLL``
r? @nikomatsakis
[nll] add tests for rust-lang#48697 and rust-lang#30104
Adds tests for the following issues:
- rust-lang#48697 ``[NLL] ICE: unexpected region for local data with reference to closure``
- rust-lang#30104 ``Destructuring boxes into multiple mutable references seems broken``
r? @nikomatsakis
…ichaelwoerister
Pretty print btreemap for GDB
Merge rust-lang#53112 first, please.
`{to,from}_{ne,le,be}_bytes` for unsigned integer types
Same as rust-lang#51919 did for signed integers.
Tracking issue: rust-lang#52963
…haelwoerister
Do not suggest conversion method that is already there
Fixrust-lang#53348.
…rted-compile-fail-tests-more-robust-wrt-nll, r=nikomatsakis
make more ported compile fail tests more robust w.r.t. NLL
This is similar to PR rust-lang#53369, except it covers a disjoint (and much smaller) set of tests that I needed to look at more carefully before being 100% certain they were the same kind of issue.
…n, r=varkor
Warn that `#![feature(rust_2018_preview)]` is implied when the edition is set to Rust 2018.
cc @varkor@petrochenkov@joshtriplett
…yurydelendik
wasm: Remove --strip-debug argument to LLD
Originally added in rust-lang#52887 this commit disables passing `--strip-debug` to LLD
when optimized. This bring back the original bug of emitting broken debuginfo
but currently it *also* strips the `name` section which makes it very difficult
to inspect the final binary. A real fix is happening at
https://reviews.llvm.org/D50729 and we can reevaluate once we've updated LLD to
have that commit.
@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Aug 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit f214666 has been approved by frewsxcv

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 17, 2018
@bors

bors commented Aug 17, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f214666 with merge de21ea8...

bors added a commit that referenced this pull request Aug 17, 2018
Rollup of 11 pull requests
Successful merges:
- #52858 (Implement Iterator::size_hint for Elaborator.)
- #53321 (Fix usage of `wasm_target_feature`)
- #53326 ([nll] add regression test for issue #27868)
- #53347 (rustc_resolve: don't allow paths starting with `::crate`.)
- #53349 ([nll] add tests for #48697 and #30104)
- #53357 (Pretty print btreemap for GDB)
- #53358 (`{to,from}_{ne,le,be}_bytes` for unsigned integer types)
- #53406 (Do not suggest conversion method that is already there)
- #53407 (make more ported compile fail tests more robust w.r.t. NLL)
- #53413 (Warn that `#![feature(rust_2018_preview)]` is implied when the edition is set to Rust 2018.)
- #53434 (wasm: Remove --strip-debug argument to LLD)
Failed merges:
r? @ghost
@bors

bors commented Aug 17, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing de21ea8 to master...

@bors
bors merged commit f214666 into rust-lang:masterAug 17, 2018
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

10 participants

@frewsxcv@bors@Centril@alexcrichton@memoryruins@SimonSapin@fukatani@estebank@pnkfelix@eddyb