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 14 pull requests #49939

Merged
merged 32 commits into from
Apr 14, 2018
Merged

Rollup of 14 pull requests #49939

merged 32 commits into from
Apr 14, 2018

Commits on Mar 28, 2018

  1. Add docs for the test crate with the std docs

    If the compiler docs aren't going to include the test crate then it may as well be included with std.
    ollie27 committed Mar 28, 2018
    Configuration menu
    Copy the full SHA
    e719bb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. proc_macro: Avoid cached TokenStream more often

    This commit adds even more pessimization to use the cached `TokenStream` inside
    of an AST node. As a reminder the `proc_macro` API requires taking an arbitrary
    AST node and transforming it back into a `TokenStream` to hand off to a
    procedural macro. Such functionality isn't actually implemented in rustc today,
    so the way `proc_macro` works today is that it stringifies an AST node and then
    reparses for a list of tokens.
    
    This strategy unfortunately loses all span information, so we try to avoid it
    whenever possible. Implemented in rust-lang#43230 some AST nodes have a `TokenStream`
    cache representing the tokens they were originally parsed from. This
    `TokenStream` cache, however, has turned out to not always reflect the current
    state of the item when it's being tokenized. For example `#[cfg]` processing or
    macro expansion could modify the state of an item. Consequently we've seen a
    number of bugs (rust-lang#48644 and rust-lang#49846) related to using this stale cache.
    
    This commit tweaks the usage of the cached `TokenStream` to compare it to our
    lossy stringification of the token stream. If the tokens that make up the cache
    and the stringified token stream are the same then we return the cached version
    (which has correct span information). If they differ, however, then we will
    return the stringified version as the cache has been invalidated and we just
    haven't figured that out.
    
    Closes rust-lang#48644
    Closes rust-lang#49846
    alexcrichton committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    6d7cfd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. Configuration menu
    Copy the full SHA
    43301e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    34956c8 View commit details
    Browse the repository at this point in the history
  3. Ignore copyright year when generating deriving span tests

    Previously, generate-deriving-span-tests.py would regenerate all the tests anew, even if they hadn't changed. This creates unnecessary diffs that only change the copyright year. Now we check to see if any of the content of the test has changed before generating the new one.
    varkor committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    0b393e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Configuration menu
    Copy the full SHA
    6f10146 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de34533 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2f60341 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3366032 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2018

  1. Remove -Z miri debugging option

    f-bro committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    35087fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b744e3d View commit details
    Browse the repository at this point in the history
  3. Update Cargo

    This includes rust-lang/cargo#5353,
    which we might want to test via opt-in in the wild
    matklad committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    6c7d3a1 View commit details
    Browse the repository at this point in the history
  4. Use InternedString rather than Name for RegionParameterDef

    This makes it consistent with TypeParameterDef.
    varkor committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    6234d41 View commit details
    Browse the repository at this point in the history
  5. Update RLS

    matklad committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    d015945 View commit details
    Browse the repository at this point in the history
  6. Cleanup liballoc use statements

    Some modules were still using the deprecated `allocator` module, use the
    `alloc` module instead.
    
    Some modules were using `super` while it's not needed.
    
    Some modules were more or less ordering them, and other not, so the
    latter have been modified to match the others.
    glandium committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    bd9ff84 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2018

  1. Rollup merge of rust-lang#49951 - matklad:update-cargo, r=nrc

    Update Cargo
    
    This includes rust-lang/cargo#5353, which we  want to test via opt-in in the wild.
    
    This'll break RLS, the fix is rust-lang/rls#822
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    fbbc990 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#49852 - alexcrichton:fix-more-proc-macros, …

    …r=nrc
    
    proc_macro: Avoid cached TokenStream more often
    
    This commit adds even more pessimization to use the cached `TokenStream` inside
    of an AST node. As a reminder the `proc_macro` API requires taking an arbitrary
    AST node and transforming it back into a `TokenStream` to hand off to a
    procedural macro. Such functionality isn't actually implemented in rustc today,
    so the way `proc_macro` works today is that it stringifies an AST node and then
    reparses for a list of tokens.
    
    This strategy unfortunately loses all span information, so we try to avoid it
    whenever possible. Implemented in rust-lang#43230 some AST nodes have a `TokenStream`
    cache representing the tokens they were originally parsed from. This
    `TokenStream` cache, however, has turned out to not always reflect the current
    state of the item when it's being tokenized. For example `#[cfg]` processing or
    macro expansion could modify the state of an item. Consequently we've seen a
    number of bugs (rust-lang#48644 and rust-lang#49846) related to using this stale cache.
    
    This commit tweaks the usage of the cached `TokenStream` to compare it to our
    lossy stringification of the token stream. If the tokens that make up the cache
    and the stringified token stream are the same then we return the cached version
    (which has correct span information). If they differ, however, then we will
    return the stringified version as the cache has been invalidated and we just
    haven't figured that out.
    
    Closes rust-lang#48644
    Closes rust-lang#49846
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    95b7e6f View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#49866 - Mark-Simulacrum:pr-travis-windows, …

    …r=alexcrichton
    
    Cross-compile builder to Windows for PRs on Travis
    
    I chose a completely arbitrary windows target here (I have no idea what's best, we could do multiple -- they are relatively fast).
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    642bcc4 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#49876 - oli-obk:no_secret_clippy_on_stable_…

    …☹, r=nrc
    
    Don't inject clippy into rls on stable/beta
    
    as discussed at the all-hands
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    c22b4db View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#49465 - ollie27:rustbuild_test_docs, r=stev…

    …eklabnik,QuietMisdreavus,frewsxcv,GuillaumeGomez
    
    Add docs for the test crate with the std docs
    
    If the compiler docs aren't going to include the test crate then it may as well be included with std.
    
    Fixes rust-lang#49388
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    15eb465 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#49886 - varkor:generate-deriving-span-tests…

    …-usability, r=nikomatsakis
    
    Ignore copyright year when generating deriving span tests
    
    Previously, generate-deriving-span-tests.py would regenerate all the tests anew, even if they hadn't changed. This creates unnecessary diffs that only change the copyright year. Now we check to see if any of the content of the test has changed before generating the new one.
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    070a771 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#49908 - chrisccoulson:fix-rustdoc-themes-te…

    …st-without-rpath, r=Mark-Simulacrum
    
    Fix test failure in src/tools/rustdoc-themes when rust.rpath = false
    
    See rust-lang#49907
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    44a71e2 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#49913 - varkor:RegionParameterDef-InternedS…

    …tring, r=petrochenkov
    
    Use InternedString rather than Name for RegionParameterDef
    
    This makes it consistent with `TypeParameterDef`.
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    6f629d3 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#49915 - llogiq:doc-shift-types, r=joshtriplett

    [doc] note the special type inference handling for shift ops
    
    This adds a note to the docs about the difference between the shift ops and the corresponding trait methods when it comes to type inference.
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    d21433e View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#49916 - llogiq:doc-atomic-fetch-update, r=k…

    …ennytm
    
    improve Atomic*::fetch_update docs
    
    This clarifies that fetch_update *always* returns the previous value, either as `Ok(_)` or `Err(_)`, depending on whether the supplied update function returned `Some(_)` or `None`.
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    31906e4 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#49922 - f-bro:zmiri, r=oli-obk

    Remove -Zmiri debugging option
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    e681ba2 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    4c8e9b9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    e35499c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4472991 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#49958 - glandium:cleanup, r=SimonSapin

    Cleanup liballoc use statements
    
    Some modules were still using the deprecated `allocator` module, use the
    `alloc` module instead.
    
    Some modules were using `super` while it's not needed.
    
    Some modules were more or less ordering them, and other not, so the
    latter have been modified to match the others.
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    9659f05 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#49871 - SimonSapin:int-bytes, r=sfackler

    Add to_bytes and from_bytes to primitive integers
    
    Discussion issue turned tracking issue: rust-lang#49792
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    709ec40 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#49864 - QuietMisdreavus:doctest-target-feat…

    …ures, r=GuillaumeGomez
    
    add target features when extracting and running doctests
    
    When rendering documentation, rustdoc will happily load target features into the cfg environment from the current target, but fails to do this when doing anything with doctests. This would lead to situations where, thanks to rust-lang#48759, functions tagged with `#[target_feature]` couldn't run doctests, thanks to the automatic `#[doc(cfg(target_feature = "..."))]`.
    
    Currently, there's no way to pass codegen options to rustdoc that will affect its rustc sessions, but for now this will let you use target features that come default on the platform you're targeting.
    
    Fixes rust-lang#49723
    kennytm committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    0e9d6f9 View commit details
    Browse the repository at this point in the history