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 #64754

Merged
merged 24 commits into from
Sep 25, 2019
Merged

Rollup of 7 pull requests #64754

merged 24 commits into from
Sep 25, 2019

Commits on Sep 15, 2019

  1. Made a thread local storage panic message more explanatory

    (TLS is usually understood as Transport Layer Security
    outside rust-std internals)
    tomtau committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    df7789c View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

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

Commits on Sep 19, 2019

  1. add is_async_fn query

    csmoe committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    2fd4c27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ffb1ce View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2019

  1. rename is_async_fn to asyncness

    csmoe committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    a813cc1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    726fe3b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    983e035 View commit details
    Browse the repository at this point in the history
  4. update ui tests

    GuillaumeGomez committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    d2b873b View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. rustc: Convert dependency_formats to a query

    This commit converts a field of `Session`, `dependency_formats`, into a
    query of `TyCtxt`. This information then also needed to be threaded
    through to other remaining portions of the linker, but it's relatively
    straightforward. The only change here is that instead of
    `HashMap<CrateType, T>` the data structure changed to `Vec<(CrateType,
    T)>` to make it easier to deal with in queries.
    alexcrichton committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    5d531ae View commit details
    Browse the repository at this point in the history
  2. rustc: Fix mixing crates with different share_generics

    This commit addresses rust-lang#64319 by removing the `dylib` crate type from the
    list of crate type that exports generic symbols. The bug in rust-lang#64319
    arises because a `dylib` crate type was trying to export a symbol in an
    uptream crate but it miscalculated the symbol name of the uptream
    symbol. This isn't really necessary, though, since `dylib` crates aren't
    that heavily used, so we can just conservatively say that the `dylib`
    crate type never exports generic symbols, forcibly removing them from
    the exported symbol lists if were to otherwise find them.
    
    The fix here happens in two places:
    
    * First is in the `local_crate_exports_generics` method, indicating that
      it's now `false` for the `Dylib` crate type. Only rlibs actually
      export generics at this point.
    
    * Next is when we load exported symbols from upstream crate. If, for our
      compilation session, the crate may be included from a dynamic library,
      then its generic symbols are removed. When the crate was linked into a
      dynamic library its symbols weren't exported, so we can't consider
      them a candidate to link against.
    
    Overally this should avoid situations where we incorrectly calculate the
    upstream symbol names in the face of differnet `share_generics` options,
    ultimately...
    
    Closes rust-lang#64319
    alexcrichton committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    50c57d8 View commit details
    Browse the repository at this point in the history
  3. Allow using upstream generics in a dylib crate type

    ... just don't export them!
    alexcrichton committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    f00c634 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Configuration menu
    Copy the full SHA
    a744fd0 View commit details
    Browse the repository at this point in the history
  2. Update cargo

    11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
    2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
    - Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
    - Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
    - Update some unstable docs (rust-lang/cargo#7407)
    - Fix xcompile tests. (rust-lang/cargo#7408)
    - -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
    - Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
    - -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
    - Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
    - Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
    - Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
    - Extract Platform to a separate crate. (rust-lang/cargo#7375)
    alexcrichton committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    5c5e3fa View commit details
    Browse the repository at this point in the history
  3. Remove blanket silencing of "type annotation needed" errors

    Remove blanket check for existence of other errors before emitting
    "type annotation needed" errors, and add some eager checks to avoid
    adding obligations when they refer to types that reference
    `[type error]` in order to reduce unneded errors.
    estebank committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    d9ab4ff View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    affa038 View commit details
    Browse the repository at this point in the history
  5. fix rebase

    estebank committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    b7ca1c5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6d07874 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Rollup merge of rust-lang#64324 - alexcrichton:share-generics-again, …

    …r=michaelwoerister
    
    rustc: Fix mixing crates with different `share_generics`
    
    This commit addresses rust-lang#64319 by removing the `dylib` crate type from the
    list of crate type that exports generic symbols. The bug in rust-lang#64319
    arises because a `dylib` crate type was trying to export a symbol in an
    uptream crate but it miscalculated the symbol name of the uptream
    symbol. This isn't really necessary, though, since `dylib` crates aren't
    that heavily used, so we can just conservatively say that the `dylib`
    crate type never exports generic symbols, forcibly removing them from
    the exported symbol lists if were to otherwise find them.
    
    The fix here happens in two places:
    
    * First is in the `local_crate_exports_generics` method, indicating that
      it's now `false` for the `Dylib` crate type. Only rlibs actually
      export generics at this point.
    
    * Next is when we load exported symbols from upstream crate. If, for our
      compilation session, the crate may be included from a dynamic library,
      then its generic symbols are removed. When the crate was linked into a
      dynamic library its symbols weren't exported, so we can't consider
      them a candidate to link against.
    
    Overally this should avoid situations where we incorrectly calculate the
    upstream symbol names in the face of differnet `share_generics` options,
    ultimately...
    
    Closes rust-lang#64319
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    40fae88 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#64428 - GuillaumeGomez:error-explanation-E0…

    …524, r=Centril
    
    Error explanation e0524
    
    Part of rust-lang#61137
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    0204f36 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#64481 - tomtau:fix/tls-error-message, r=Kod…

    …rAus
    
    A more explanatory thread local storage panic message
    
    Outside rust-std internals, TLS is usually understood as Transport Layer Security, so the existing message could be a bit puzzling when one has TLS sessions in `thread_local!`.
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    bc3afb7 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#64599 - csmoe:doc_async_reexport, r=nikomat…

    …sakis
    
    Rustdoc render async function re-export
    
    Closes rust-lang#63710
    r? @nikomatsakis
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    34067ee View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#64743 - alexcrichton:update-cargo, r=nikoma…

    …tsakis
    
    Update cargo
    
    11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
    2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
    - Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
    - Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
    - Update some unstable docs (rust-lang/cargo#7407)
    - Fix xcompile tests. (rust-lang/cargo#7408)
    - -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
    - Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
    - -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
    - Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
    - Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
    - Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
    - Extract Platform to a separate crate. (rust-lang/cargo#7375)
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    66ca0eb View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#64746 - estebank:elide-impl-trait-obligatio…

    …ns-on-err, r=cramertj
    
    Remove blanket silencing of "type annotation needed" errors
    
    Remove blanket check for existence of other errors before emitting "type annotation needed" errors, and add some eager checks to avoid adding obligations when they refer to types that reference `[type error]` in order to reduce unneeded errors.
    
    Fix rust-lang#64084.
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    5ed746b View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#64753 - ehuss:json-short-explain, r=Mark-Si…

    …mulacrum
    
    Don't emit explain with json short messages.
    
    This fixes an issue where `--error-format=json --json=diagnostic-short` would emit the "For more information about this error" message, which doesn't match the behavior of `--error-format=short` which explicitly excludes it.
    Centril authored Sep 25, 2019
    Configuration menu
    Copy the full SHA
    fa6dfc9 View commit details
    Browse the repository at this point in the history