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 6 pull requests #70672

Merged
merged 24 commits into from
Apr 1, 2020
Merged

Rollup of 6 pull requests #70672

merged 24 commits into from
Apr 1, 2020

Commits on Mar 30, 2020

  1. Simplify NodeItem

    The generic parameter is unused, and so is `map`
    jonas-schievink committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    a1e7495 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    49ba323 View commit details
    Browse the repository at this point in the history
  3. Add a test

    jonas-schievink committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    103771c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e8910f5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b00ba38 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    12d9f4e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2117817 View commit details
    Browse the repository at this point in the history
  8. bless tests

    RalfJung committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    39e189d View commit details
    Browse the repository at this point in the history
  9. Format

    jonas-schievink committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    fd8f818 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    abe143a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    a1a583b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d8a0600 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. Configuration menu
    Copy the full SHA
    f259470 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ad74480 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    96deb95 View commit details
    Browse the repository at this point in the history
  4. cargotest: remove webrender

    The current webrender commit occasionally fails without a reason, and
    the latest webrender commit is missing a dependency on our Windows
    builders. It's not worth installing an extra dependency for cargotest,
    and the spurious failure makes keeping this test not worth it.
    pietroalbini committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    0110634 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Configuration menu
    Copy the full SHA
    3bcb3ef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f181778 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#70535 - jonas-schievink:graph-refactor, r=n…

    …ikomatsakis
    
    Track the finalizing node in the specialization graph
    
    Fixes rust-lang#70419
    Fixes rust-lang#70442
    
    r? @eddyb
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    0e0d84c View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#70590 - RalfJung:miri-backtrace, r=oli-obk

    Miri: make backtrace function names and spans match up
    
    Currently, Miri backtraces are a bit confusing:
    ```
    error: Undefined Behavior: entering unreachable code
      --> tests/compile-fail/never_transmute_void.rs:10:11
       |
    10 |     match v {} //~ ERROR  entering unreachable code
       |           ^ entering unreachable code
       |
       = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
       = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    note: inside call to `f` at tests/compile-fail/never_transmute_void.rs:17:5
      --> tests/compile-fail/never_transmute_void.rs:17:5
       |
    17 |     f(v); //~ inside call to `f`
       |     ^^^^
       = note: inside call to `main` at /home/r/.rustup/toolchains/miri/lib/rustlib/src/rust/src/libstd/rt.rs:67:34
       = note: inside call to closure at /home/r/.rustup/toolchains/miri/lib/rustlib/src/rust/src/libstd/rt.rs:52:73
       = note: inside call to closure at /home/r/.rustup/toolchains/miri/lib/rustlib/src/rust/src/libstd/sys_common/backtrace.rs:130:5
    ```
    When reading this like a normal backtrace, one would expect that e.g. the backrace involves the "main" function at "libstd/rt.rs:67:34". But that is not actually where we are in the main function, that is *where the main function is called*.
    
    This is not how backtraces are usually rendered (including e.g. with `RUST_BACKTRACE=1`). Usually we print next to each function name where inside that function the frame is currently executing, not where the *parent* frame is executing. With this PR and the Miri side at rust-lang/miri#1283, the backtrace now looks as follows:
    ```
    error: Undefined Behavior: entering unreachable code
      --> tests/compile-fail/never_transmute_void.rs:10:11
       |
    10 |     match v {} //~ ERROR entering unreachable code
       |           ^ entering unreachable code
       |
       = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
       = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
       = note: inside `f` at tests/compile-fail/never_transmute_void.rs:10:11
    note: inside `main` at tests/compile-fail/never_transmute_void.rs:17:5
      --> tests/compile-fail/never_transmute_void.rs:17:5
       |
    17 |     f(v); //~ inside `main`
       |     ^^^^
       = note: inside closure at /home/r/src/rust/rustc/src/libstd/rt.rs:67:34
       = note: inside closure at /home/r/src/rust/rustc/src/libstd/rt.rs:52:73
       = note: inside `std::sys_common::backtrace::__rust_begin_short_backtrace::<[closure@DefId(1:6034 ~ std[87db]::rt[0]::lang_start_internal[0]::{{closure}}[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /home/r/src/rust/rustc/src/libstd/sys_common/backtrace.rs:130:5
    ```
    Now function name and printed line numbers match up in the notes.
    
    This code is partially shared with const-eval, so the change also affects const-eval: instead of printing what is being called at some span, we print which function/constant this span is inside.
    
    With this, we can also remove the `span` field from Miri's stack frames (which used to track the *caller span* of that frame, quite confusing), and then get of a whole lot of `span` arguments that ultimately just served to fill that field (and as a fallback for `caller_location`, which however was never actually used).
    
    r? @oli-obk
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    b919df2 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#70616 - anyska:fieldplacement-rename, r=oli…

    …-obk
    
    rustc_target::abi: rename FieldPlacement to FieldsShape.
    
    Originally suggested by @eddyb.
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    1b40067 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#70626 - pietroalbini:remove-webrender-cargo…

    …test, r=Mark-Simulacrum
    
    cargotest: remove webrender
    
    The current webrender commit occasionally fails without a reason, and the latest webrender commit is missing a dependency on our Windows builders. It's not worth installing an extra dependency for cargotest, and the spurious failure makes keeping this test not worth it.
    
    r? @Mark-Simulacrum
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    0863e2c View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#70649 - GuillaumeGomez:cleanup-e0468, r=Dyl…

    …an-DPC
    
    clean up E0468 explanation
    
    r? @Dylan-DPC
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    37b2e3f View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#70662 - eddyb:compiletest-stdout-fix, r=Mar…

    …k-Simulacrum
    
    compiletest: don't use `std::io::stdout()`, as it bypasses `set_print`.
    
    This PR undoes a change made during rust-lang#69916, which became unnecessary during review but was left in by accident, and which isn't correct due to `libtest` using `std::io::set_print`, which overwrites the `println!` behavior but *not* `writeln!(std::io::stdout(), ...)`.
    
    The effect of using `writeln!(std::io::stdout(), ...)` was that the diff output would show *while* running the tests, instead of at the end, when failing tests are listed.
    
    r? @Mark-Simulacrum cc @oli-obk
    Dylan-DPC committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    7d4d450 View commit details
    Browse the repository at this point in the history