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 7 pull requests #70040

Merged
merged 28 commits into from
Mar 16, 2020
Merged

Rollup of 7 pull requests #70040

merged 28 commits into from
Mar 16, 2020

Commits on Mar 7, 2020

  1. Configuration menu
    Copy the full SHA
    8de1ec9 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
  7. Add long error explanation for E0628 rust-lang#61137

    Ayush Kumar Mishra committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    7b75c34 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Configuration menu
    Copy the full SHA
    1305ae6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f7fcb58 View commit details
    Browse the repository at this point in the history
  3. Minor change

    Ayush Kumar Mishra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    00c6abe View commit details
    Browse the repository at this point in the history
  4. Minor change

    Ayush Kumar Mishra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    c33c88b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Configuration menu
    Copy the full SHA
    6f75d3f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Configuration menu
    Copy the full SHA
    65bf483 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3fbb254 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8c9a38f View commit details
    Browse the repository at this point in the history
  4. hygiene: modern -> normalize_to_macros_2_0

    `modern_and_legacy` -> `normalize_to_macro_rules`
    petrochenkov committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    db638bd View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. More Method->Fn renaming

    mark-i-m committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    7bd8ce2 View commit details
    Browse the repository at this point in the history
  2. update comment

    mark-i-m committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    e3c15ae View commit details
    Browse the repository at this point in the history
  3. MethodData -> AssocFnData

    mark-i-m committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1b92e86 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2c2d41d View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#67335 - ecstatic-morse:qualif-refactor, r=e…

    …ddyb
    
    Refactor the `Qualif` trait
    
    This PR attempts to preserve the existing semantics of the `Qualif` trait while reducing its API to two significant methods with descriptive names, `in_any_value_of_ty` and `in_adt_inherently`. The other `in_*` methods have been made into free functions, since they should never be overloaded. Finally, I changed the bounds on the `in_local` argument to be less restrictive (`FnMut` instead of `Fn`), which addresses a FIXME in the const-checker.
    
    r? @eddyb
    cc @pnkfelix @oli-obk
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    59b0058 View commit details
    Browse the repository at this point in the history
  6. 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.
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    2443eb4 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#69520 - kornelski:e69492, r=cramertj

    Make error message clearer about creating new module
    
    This is a partial improvement for rust-lang#69492
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1685264 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#69738 - mark-i-m:assoc-fn-2, r=eddyb

    More Method -> AssocFn renaming
    
    r? @Centril @eddyb
    
    cc rust-lang#60163
    
    Blocked on rust-lang#69674
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    0d7c82e View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#69867 - ayushmishra2005:doc/61137-add-long-…

    …error-code-e0628, r=Dylan-DPC
    
    Add long error explanation for E0628
    
    Add long explanation for the E0628 error code
    Part of rust-lang#61137
    
    r? @GuillaumeGomez
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    8f2482b View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#69989 - petrochenkov:nolegacy, r=eddyb,matt…

    …hewjasper
    
    resolve/hygiene: `macro_rules` are not "legacy"
    
    The "modern" vs "legacy" naming was introduced by jseyfried during initial implementation of macros 2.0.
    At this point it's clear that `macro_rules` are not going anywhere and won't be deprecated in the near future.
    So this PR changes the naming "legacy" (when it implies "macro_rules") to "macro_rules".
    This should also help people reading this code because it's wasn't obvious that "legacy" actually meant "macro_rules" in these contexts.
    
    The most contentious renaming here is probably
    ```
    fn modern -> fn normalize_to_macros_2_0
    fn modern_and_legacy -> fn normalize_to_macro_rules
    ```
    Other alternatives that I could think of are `normalize_to_opaque`/`normalize_to_semitransparent`, or `strip_non_opaque`/`strip_transparent`, but they seemed less intuitive.
    The documentation to these functions can be found in `symbol.rs`.
    
    r? @matthewjasper
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    8872d90 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#70036 - mark-i-m:describe-it-4, r=eddyb

    Make article_and_description primarily use def_kind
    
    r? @eddyb
    
    cc @matthewjasper
    Dylan-DPC authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    d8dbb3c View commit details
    Browse the repository at this point in the history