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 3 pull requests #63726

Closed
wants to merge 16 commits into from
Closed

Commits on Aug 19, 2019

  1. start cleaning up subst mess

    fix an ICE
    
    fix method name
    RalfJung authored and eddyb committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    d4196a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b4f217e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ada6f1c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0919f7c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4149964 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ceabe0d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7d9af83 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f4aa00b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    cb66500 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    96fc989 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8b932df View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    914e1f4 View commit details
    Browse the repository at this point in the history
  13. bootstrap: Merge the libtest build step with libstd

    Since its inception rustbuild has always worked in three stages: one for
    libstd, one for libtest, and one for rustc. These three stages were
    architected around crates.io dependencies, where rustc wants to depend
    on crates.io crates but said crates don't explicitly depend on libstd,
    requiring a sysroot assembly step in the middle. This same logic was
    applied for libtest where libtest wants to depend on crates.io crates
    (`getopts`) but `getopts` didn't say that it depended on std, so it
    needed `std` built ahead of time.
    
    Lots of time has passed since the inception of rustbuild, however,
    and we've since gotten to the point where even `std` itself is depending
    on crates.io crates (albeit with some wonky configuration). This
    commit applies the same logic to the two dependencies that the `test`
    crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
    many years since rustbuild's inception `unicode-width` was the only
    dependency picked up by the `test` crate, so the extra configuration
    necessary to get crates building in this crate graph is unlikely to be
    too much of a burden on developers.
    
    After this patch it means that there are now only two build phasese of
    rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
    build phase is all lumped into one now with `std`.
    
    This was originally motivated by rust-lang/cargo#7216 where Cargo was
    having to deal with synthesizing dependency edges but this commit makes
    them explicit in this repository.
    alexcrichton committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    72470e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Rollup merge of rust-lang#63497 - eddyb:miri-subst, r=oli-obk

    rustc_mir: fix miri substitution/"universe" discipline.
    
    Alternative to rust-lang#61041, based on @RalfJung's own attempt at it.
    I haven't done a full audit, but I believe everything is fixed now.
    
    Fixes rust-lang#61432.
    Closes rust-lang#61336, as a drive-by fix (for a subset of rust-lang#43408, that is already special-cased).
    
    r? @oli-obk / @RalfJung cc @varkor @yodaldevoid
    Centril authored Aug 20, 2019
    Configuration menu
    Copy the full SHA
    5ae0710 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#63637 - alexcrichton:remove-libtest-step, r…

    …=Mark-Simulacrum
    
    bootstrap: Merge the libtest build step with libstd
    
    Since its inception rustbuild has always worked in three stages: one for
    libstd, one for libtest, and one for rustc. These three stages were
    architected around crates.io dependencies, where rustc wants to depend
    on crates.io crates but said crates don't explicitly depend on libstd,
    requiring a sysroot assembly step in the middle. This same logic was
    applied for libtest where libtest wants to depend on crates.io crates
    (`getopts`) but `getopts` didn't say that it depended on std, so it
    needed `std` built ahead of time.
    
    Lots of time has passed since the inception of rustbuild, however,
    and we've since gotten to the point where even `std` itself is depending
    on crates.io crates (albeit with some wonky configuration). This
    commit applies the same logic to the two dependencies that the `test`
    crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
    many years since rustbuild's inception `unicode-width` was the only
    dependency picked up by the `test` crate, so the extra configuration
    necessary to get crates building in this crate graph is unlikely to be
    too much of a burden on developers.
    
    After this patch it means that there are now only two build phasese of
    rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
    build phase is all lumped into one now with `std`.
    
    This was originally motivated by rust-lang/cargo#7216 where Cargo was
    having to deal with synthesizing dependency edges but this commit makes
    them explicit in this repository.
    Centril authored Aug 20, 2019
    Configuration menu
    Copy the full SHA
    ea88adc View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#63709 - matklad:decomposed-tokens, r=petroc…

    …henkov
    
    Move token gluing to token stream parsing
    
    work towards rust-lang#63689, this moves token gluing from the lexer to the token tree layer. This is only a minimal step, but I like the negative diff here.
    
    r? @petrochenkov
    Centril authored Aug 20, 2019
    Configuration menu
    Copy the full SHA
    f01858b View commit details
    Browse the repository at this point in the history