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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #60843

Closed
wants to merge 48 commits into from
Closed

Rollup of 6 pull requests #60843

wants to merge 48 commits into from

Commits on May 11, 2019

  1. Remove unnecessary secondary recursion

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    677161e View commit details
    Browse the repository at this point in the history

  2. Ignore .vscode even if it is a symlink

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    35cf77f View commit details
    Browse the repository at this point in the history

  3. Reuse the pretty printing architecture for printing of constants

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    f223eec View commit details
    Browse the repository at this point in the history

  4. There's a tcx in scope, don't use the tls one

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    72087ec View commit details
    Browse the repository at this point in the history

  5. Merge the string printing paths of ty::Const

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    7e7cd92 View commit details
    Browse the repository at this point in the history

  6. Print const chars escaped with surrounding quotes

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    17c6c8d View commit details
    Browse the repository at this point in the history

  7. Don't use ty::Const without immediately interning

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    04ad22c View commit details
    Browse the repository at this point in the history

  8. Add test showing how byte slices are printed in MIR

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    3a4f5ab View commit details
    Browse the repository at this point in the history

  9. Refactor string constant printing to prep for byte string printing

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    f4f82ff View commit details
    Browse the repository at this point in the history

  10. Make ConstValue::Slice solely take [u8] and str

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    1468f20 View commit details
    Browse the repository at this point in the history

  11. Render const byte slices in MIR

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    d46c964 View commit details
    Browse the repository at this point in the history

  12. u8 is printed as a number, not a character

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    46704bf View commit details
    Browse the repository at this point in the history

  13. Render unresolved anon consts like closures

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    983f676 View commit details
    Browse the repository at this point in the history

  14. Group common printing code during constant pretty printing

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    b7c094b View commit details
    Browse the repository at this point in the history

  15. Print generic args in function calls in MIR

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    f2d2250 View commit details
    Browse the repository at this point in the history

  16. Fix tidy

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    830ce73 View commit details
    Browse the repository at this point in the history

  17. Use write_char to skip the formatting infrastructure

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    bb6f156 View commit details
    Browse the repository at this point in the history

  18. Print unevaluted constants as _ or as their source representation

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    05d8b4c View commit details
    Browse the repository at this point in the history

  19. Update ui tests

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    681680d View commit details
    Browse the repository at this point in the history

  20. rustc: integrate ty::Const into ty::print as print_const.

    @eddyb @oli-obk
    eddyb authored and oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    816f755 View commit details
    Browse the repository at this point in the history

  21. Break cycle during array length printing

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    ed68cbe View commit details
    Browse the repository at this point in the history

  22. Fix rebase fallout

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    b4bbf95 View commit details
    Browse the repository at this point in the history

  23. Print types for unevaluated constants

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    7902347 View commit details
    Browse the repository at this point in the history

  24. Update ui tests

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    15acc32 View commit details
    Browse the repository at this point in the history

  25. Only print integers in symbol path's constants

    @oli-obk
    oli-obk committed May 11, 2019
    Configuration menu
    Copy the full SHA
    6a08e4e View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Move token tree related lexer state to a separate struct 

    We only used a bunch of fields when tokenizing into a token tree,
so let's move them out of the base lexer
    @matklad
    matklad committed May 13, 2019
    Configuration menu
    Copy the full SHA
    d29f0d2 View commit details
    Browse the repository at this point in the history

  2. move span and token to tt reader

    @matklad
    matklad committed May 13, 2019
    Configuration menu
    Copy the full SHA
    b91e0a3 View commit details
    Browse the repository at this point in the history

  3. move raw span to tt reader 

    See https://github.com/rust-lang/rust/pull/50838/files#r283296243 for
explanation how jointness checking works with *next* pair
    @matklad
    matklad committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e249f2e View commit details
    Browse the repository at this point in the history

  4. Remove unused parameter from in(_opt)?_scope

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    19a9109 View commit details
    Browse the repository at this point in the history

  5. Give match arms an HirId and a Span

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    63f47b7 View commit details
    Browse the repository at this point in the history

  6. Respect lint attributes on match arms

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    7a53e03 View commit details
    Browse the repository at this point in the history

  7. Handle the visibility/lint scope distinction better 

    * Don't generate an extra lint scope for each `let` statement.
* Place match guards inside the visiblility scope of the bindings for
  their arm.
    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    ca8db94 View commit details
    Browse the repository at this point in the history

  8. Give match arms a drop/region scope 

    Also give arms the correct lint scope in MIR.
    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    531c2f8 View commit details
    Browse the repository at this point in the history

  9. Remove MIR borrowck hack for old match scopes

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    bd8ecc6 View commit details
    Browse the repository at this point in the history

  10. Emit fake borrows for all tests 

    I was incorrectly under the impression that this would only lead to
duplicates. See `mir-opt/match-arm-scope.rs` (upcomming commit) for a
case where we didn't emit a fake borrow of `items.1`.
    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    decfc9b View commit details
    Browse the repository at this point in the history

  11. Schedule storage-dead of temporaries sooner 

    This ensures that we will correctly generate a storage-dead if the
initializing expression diverges.
    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    4a6ba51 View commit details
    Browse the repository at this point in the history

  12. Add a test for match scopes

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    47c4e8c View commit details
    Browse the repository at this point in the history

  13. Comment style fixes 

    Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
    @Centril @matthewjasper
    Centril and matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    8094d6e View commit details
    Browse the repository at this point in the history

  14. Fix match ergonomics suggestion

    @matthewjasper
    matthewjasper committed May 13, 2019
    Configuration menu
    Copy the full SHA
    5b5255d View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. Bump measureme dependency to 0.3 

    measureme@0.3 adds a version header to the binary file format which will
help reduce tool breakage in the future.
    @wesleywiser
    wesleywiser committed May 14, 2019
    Configuration menu
    Copy the full SHA
    ea93215 View commit details
    Browse the repository at this point in the history

  2. Update LLVM to fix assertion when compiling to wasm 

    More details can be found in rust-lang#60540!

Closes rust-lang#60540
    @alexcrichton
    alexcrichton committed May 14, 2019
    Configuration menu
    Copy the full SHA
    441ca63 View commit details
    Browse the repository at this point in the history

  3. rustbuild/LLVM: Do not print installation messages for up-to-date files

    @petrochenkov
    petrochenkov committed May 14, 2019
    Configuration menu
    Copy the full SHA
    3646b3c View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. Rollup merge of rust-lang#59276 - oli-obk:cleanups, r=eddyb 

    Cleanup (pretty) printing of `ty::Const`

r? @eddyb

addresses https://github.com/rust-lang/rust/pull/59178/files/5cd28066214a4a255bac6655c20bf05cb95730fd#r266243236 and https://github.com/rust-lang/rust/pull/59178/files/5cd28066214a4a255bac6655c20bf05cb95730fd#r266243336
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    83bb459 View commit details
    Browse the repository at this point in the history

  2. Rollup merge of rust-lang#60174 - matthewjasper:add-match-arm-scopes,… 

    … r=pnkfelix

Add match arm scopes and other scope fixes

* Add drop and lint scopes for match arms.
* Lint attributes are now respected on match arms.
* Make sure we emit a StorageDead if we diverge when initializing a temporary.
* Adjust MIR pretty printing of scopes for locals.
* Don't generate duplicate lint scopes for `let statements`.
* Add some previously missing fake borrows for matches.

closes rust-lang#46525

cc @rust-lang/compiler
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    e9cb236 View commit details
    Browse the repository at this point in the history

  3. Rollup merge of rust-lang#60763 - matklad:tt-parser, r=petrochenkov 

    Move token tree related lexer state to a separate struct

Just a types-based refactoring.

We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    b16116b View commit details
    Browse the repository at this point in the history

  4. Rollup merge of rust-lang#60811 - wesleywiser:bump_measureme, r=varkor 

    Bump measureme dependency to 0.3

measureme@0.3 adds a version header to the binary file format which will
help reduce tool breakage in the future.
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    c5981b2 View commit details
    Browse the repository at this point in the history

  5. Rollup merge of rust-lang#60831 - alexcrichton:update-llvm-project, r… 

    …=nikic

Update LLVM to fix assertion when compiling to wasm

More details can be found in rust-lang#60540!

Closes rust-lang#60540
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    a8fa79a View commit details
    Browse the repository at this point in the history

  6. Rollup merge of rust-lang#60832 - petrochenkov:CLazy, r=Mark-Simulacrum 

    CMake: Do not print installation messages for up-to-date files

Closes rust-lang#60830
    @Centril
    Centril authored May 15, 2019
    Configuration menu
    Copy the full SHA
    adb05d1 View commit details
    Browse the repository at this point in the history