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 4 pull requests #41294

Merged
merged 21 commits into from
Apr 14, 2017
Merged

Rollup of 4 pull requests #41294

merged 21 commits into from
Apr 14, 2017

Commits on Apr 13, 2017

  1. Configuration menu
    Copy the full SHA
    03b0d99 View commit details
    Browse the repository at this point in the history
  2. Update various bookshelf repositories.

    The book and the reference have both had changes lately; this integrates
    them upstream.
    steveklabnik committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    537eb45 View commit details
    Browse the repository at this point in the history
  3. remove metadata_* from SharedCrateContext

    No good reason for them to be in there.
    nikomatsakis committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    15507bc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b078ece View commit details
    Browse the repository at this point in the history
  5. remove unused link_meta

    nikomatsakis committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    7b42924 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3387505 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fe78b54 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6cb516a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bc79f01 View commit details
    Browse the repository at this point in the history
  10. rewrite post-processing routines not to require a CrateContext

    These do some low-level munging on the LLVM data structures. Unclear
    that they need to operate as a "second pass" but leave it for now.
    nikomatsakis committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    863927c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    3f59079 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c22fdf9 View commit details
    Browse the repository at this point in the history
  13. remove LinkMeta from SharedCrateContext

    A number of things were using `crate_hash` that really ought to be using
    `crate_disambiguator` (e.g., to create the plugin symbol names). They
    have been updated.
    
    It is important to remove `LinkMeta` from `SharedCrateContext` since it
    contains a hash of the entire crate, and hence it will change
    whenever **anything** changes (which would then require
    rebuilding **everything**).
    nikomatsakis committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    f227187 View commit details
    Browse the repository at this point in the history
  14. pull stats out of SharedCrateContext

    shared mutable state is bad
    nikomatsakis committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    8e26983 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f2487b8 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    07fb93e View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. Avoid to use floating point match

    Its going to be forbidden, see issue 41255.
    est31 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    baeec7b View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#41279 - arielb1:adjustment-composition, r=n…

    …ikomatsakis
    
    rustc_typeck: consolidate adjustment composition
    
    Instead of having `write_adjustment` overwrite the previous adjustment, have `apply_adjustment` compose a new adjustment on top of the previous one. This is important because `NeverToAny` adjustments can be present on expressions during coercion.
    
    Fixes rust-lang#41213.
    
    r? @nikomatsakis
    frewsxcv authored Apr 14, 2017
    Configuration menu
    Copy the full SHA
    187f339 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#41281 - steveklabnik:update-submodules2, r=…

    …guillaumegomez
    
    bump book repos
    
    Not ready to merge yet; I'd like to see what tidy says.
    frewsxcv authored Apr 14, 2017
    Configuration menu
    Copy the full SHA
    017e3e9 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#41287 - nikomatsakis:incr-comp-refactor-tra…

    …ns, r=eddyb
    
    Miscellneous refactorings of trans
    
    This doesn't achieve any particular goal yet, but it's a collection of refactorings with the common goal of turning `SharedCrateContext` etc into stuff that we can use with on-demand and actually expect to hash in a stable fashion for incremental. Not there yet, clearly.
    
    r? @eddyb
    cc @michaelwoerister
    frewsxcv authored Apr 14, 2017
    Configuration menu
    Copy the full SHA
    adc2b10 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#41292 - est31:master, r=BurntSushi

    Avoid to use floating point match
    
    Its going to be forbidden, see issue rust-lang#41255.
    frewsxcv authored Apr 14, 2017
    Configuration menu
    Copy the full SHA
    c04ae0f View commit details
    Browse the repository at this point in the history