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 8 pull requests #69996

Closed
wants to merge 26 commits into from
Closed

Commits on Mar 5, 2020

  1. update backtrace crate

    RalfJung committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    22ee27b View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Configuration menu
    Copy the full SHA
    3ba89e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db75b6a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1f1ca87 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a9cc010 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    33600e4 View commit details
    Browse the repository at this point in the history
  6. Write backtrace fmt test using relative paths

    For some reason the absolute paths were formatted differently on the
    armhf-gnu target.
    
        thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
          left: `"Backtrace [\n    { fn: \"__rust_maybe_catch_panic\" },\n    { fn: \"std::rt::lang_start_internal\", file: \"./rust/rt.rs\", line: 300 },\n    { fn: \"std::rt::lang_start\", file: \"./rust/rt.rs\", line: 400 },\n]"`,
         right: `"Backtrace [\n    { fn: \"__rust_maybe_catch_panic\" },\n    { fn: \"std::rt::lang_start_internal\", file: \"/rust/rt.rs\", line: 300 },\n    { fn: \"std::rt::lang_start\", file: \"/rust/rt.rs\", line: 400 },\n]"`', src/libstd/backtrace.rs:486:5
    dtolnay committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    a2364dc View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. bump backtrace-sys

    RalfJung committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    9552d2e View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Compute the correct layout for variants of uninhabited enums and read…

    …d a long lost assertion
    
    This reverts part of commit 9712fa4.
    oli-obk committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    cdc7304 View commit details
    Browse the repository at this point in the history
  2. Comment nits

    Co-Authored-By: Ralf Jung <post@ralfj.de>
    oli-obk and RalfJung committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    ec88ffa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    74608c7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    543832b View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Configuration menu
    Copy the full SHA
    e809e02 View commit details
    Browse the repository at this point in the history
  2. More Method->Fn renaming

    mark-i-m committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    b2ad1ab View commit details
    Browse the repository at this point in the history
  3. update comment

    mark-i-m committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    b9aef25 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c8b527e View commit details
    Browse the repository at this point in the history
  5. update tests

    mark-i-m committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    b6518f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Add self to .mailmap

    kraai committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    40ffcc2 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Rollup merge of rust-lang#69122 - dtolnay:backtrace, r=cramertj

    Backtrace Debug tweaks
    
    - Change Debug representation of disabled and unsupported backtraces to use \<placeholder\> style, same as what we do for debug printing locked mutexes and mutably borrowed refcells;
    
        ```diff
        - Error { msg: "...", backtrace: disabled backtrace }
        + Error { msg: "...", backtrace: <disabled> }
        ```
    
    - Remove quotes around unresolved symbol names;
    
        ```diff
        - Backtrace [{ fn: "<unknown>" }]
        + Backtrace [{ fn: <unknown> }]
        ```
    
    - Add quotes around file paths;
    
        ```diff
        - Backtrace [{ fn: "krate::main", file: /path/to/main.rs, line: 10 }]
        + Backtrace [{ fn: "krate::main", file: "/path/to/main.rs", line: 10 }]
        ```
    
    - Add test.
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8f35707 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#69498 - mark-i-m:describe-it-2, r=matthewja…

    …sper
    
    Change "method" to "associated function"
    
    r? @matthewjasper
    
    cc @Centril @eddyb rust-lang#67742
    
    I'm opening this mostly as a test to see what the diagnostic changes would be. It seems that this makes them somewhat more verbose, and I'm not sure it's worth it...
    
    The relevant changes are the last two commits (it is rebased on top of rust-lang#67742)
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    0ffd85d View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#69589 - petrochenkov:maccall, r=Centril

    ast: `Mac`/`Macro` -> `MacCall`
    
    It's now obvious that these refer to macro calls rather than to macro definitions.
    
    It's also a single name instead of two different names in different places.
    
    `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls.
    
    cc rust-lang#63586 (comment)
    r? @eddyb
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7a252f7 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#69729 - RalfJung:backtrace, r=Mark-Simulacrum

    update backtrace crate
    
    In particular this release includes rust-lang/backtrace-rs#297 and rust-lang/backtrace-rs#300.
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    abbb9f4 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#69738 - mark-i-m:assoc-fn-2, r=Centril

    More Method -> AssocFn renaming
    
    r? @Centril @eddyb
    
    cc rust-lang#60163
    
    Blocked on rust-lang#69674
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7cae549 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#69768 - oli-obk:union_field_ice, r=eddyb,Ra…

    …lfJung
    
    Compute the correct layout for variants of uninhabited enums
    
    r? @eddyb
    cc @RalfJung
    
    fixes rust-lang#69191
    cc rust-lang#69763
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    5ef02a5 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#69929 - cuviper:unicode-13.0.0, r=Mark-Simu…

    …lacrum
    
    Regenerate tables for Unicode 13.0.0
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8187795 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#69987 - kraai:mailmap, r=nikomatsakis

    Add self to .mailmap
    
    The variants are only used for [rust-lang/rust-clippy](https://github.com/rust-lang/rust-clippy), but it seems like <https://thanks.rust-lang.org/> only uses this `.mailmap`.
    JohnTitor committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    1ffa1b7 View commit details
    Browse the repository at this point in the history