Rollup of 6 pull requests by Centril · Pull Request #60843 · rust-lang/rust

Centril · 2019-05-15T00:03:18Z

Successful merges:

Cleanup (pretty) printing of ty::Const #59276 (Cleanup (pretty) printing of ty::Const)
Add match arm scopes and other scope fixes #60174 (Add match arm scopes and other scope fixes)
Move token tree related lexer state to a separate struct #60763 (Move token tree related lexer state to a separate struct)
Bump measureme dependency to 0.3 #60811 (Bump measureme dependency to 0.3)
Update LLVM to fix assertion when compiling to wasm #60831 (Update LLVM to fix assertion when compiling to wasm)
CMake: Do not print installation messages for up-to-date files #60832 (CMake: Do not print installation messages for up-to-date files)

Failed merges:

Use Symbol more in lint APIs #60827 (Use Symbol more in lint APIs)

We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer

See https://github.com/rust-lang/rust/pull/50838/files#r283296243 for explanation how jointness checking works with *next* pair

* Don't generate an extra lint scope for each `let` statement. * Place match guards inside the visiblility scope of the bindings for their arm.

Also give arms the correct lint scope in MIR.

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`.

This ensures that we will correctly generate a storage-dead if the initializing expression diverges.

Co-Authored-By: matthewjasper <mjjasper1@gmail.com>

measureme@0.3 adds a version header to the binary file format which will help reduce tool breakage in the future.

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

@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

… 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. closesrust-lang#46525 cc @rust-lang/compiler

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

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.

…=nikic Update LLVM to fix assertion when compiling to wasm More details can be found in rust-lang#60540! Closesrust-lang#60540

CMake: Do not print installation messages for up-to-date files Closesrust-lang#60830

Centril · 2019-05-15T00:03:35Z

@bors r+ p=6 rollup=never

bors · 2019-05-15T00:03:38Z

📌 Commit adb05d1 has been approved by Centril

rust-highfive · 2019-05-15T00:05:21Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

oli-obkand others added 30 commits May 11, 2019 14:27

Remove unnecessary secondary recursion
677161e

Ignore .vscode even if it is a symlink
35cf77f

Reuse the pretty printing architecture for printing of constants
f223eec

There's a tcx in scope, don't use the tls one
72087ec

Merge the string printing paths of ty::Const
7e7cd92

Print const chars escaped with surrounding quotes
17c6c8d

Don't use ty::Const without immediately interning
04ad22c

Add test showing how byte slices are printed in MIR
3a4f5ab

Refactor string constant printing to prep for byte string printing
f4f82ff

Make ConstValue::Slice solely take [u8] and str
1468f20

Render const byte slices in MIR
d46c964

u8 is printed as a number, not a character
46704bf

Render unresolved anon consts like closures
983f676

Group common printing code during constant pretty printing
b7c094b

Print generic args in function calls in MIR
f2d2250

Fix tidy
830ce73

Use write_char to skip the formatting infrastructure
bb6f156

Print unevaluted constants as _ or as their source representation
05d8b4c

Update ui tests
681680d

rustc: integrate ty::Const into ty::print as print_const.
816f755

Break cycle during array length printing
ed68cbe

Fix rebase fallout
b4bbf95

Print types for unevaluated constants
7902347

Update ui tests
15acc32

Only print integers in symbol path's constants
6a08e4e

Move token tree related lexer state to a separate struct
d29f0d2
We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer

move span and token to tt reader
b91e0a3

move raw span to tt reader
e249f2e
See https://github.com/rust-lang/rust/pull/50838/files#r283296243 for explanation how jointness checking works with *next* pair

Remove unused parameter from in(_opt)?_scope
19a9109

Give match arms an HirId and a Span
63f47b7

matthewjasperand others added 18 commits May 13, 2019 20:42

Respect lint attributes on match arms
7a53e03

Handle the visibility/lint scope distinction better
ca8db94
* Don't generate an extra lint scope for each `let` statement. * Place match guards inside the visiblility scope of the bindings for their arm.

Give match arms a drop/region scope
531c2f8
Also give arms the correct lint scope in MIR.

Remove MIR borrowck hack for old match scopes
bd8ecc6

Emit fake borrows for all tests
decfc9b
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`.

Schedule storage-dead of temporaries sooner
4a6ba51
This ensures that we will correctly generate a storage-dead if the initializing expression diverges.

Add a test for match scopes
47c4e8c

Comment style fixes
8094d6e
Co-Authored-By: matthewjasper <mjjasper1@gmail.com>

Fix match ergonomics suggestion
5b5255d

Bump measureme dependency to 0.3
ea93215
measureme@0.3 adds a version header to the binary file format which will help reduce tool breakage in the future.

Update LLVM to fix assertion when compiling to wasm
441ca63
More details can be found in rust-lang#60540! Closesrust-lang#60540

rustbuild/LLVM: Do not print installation messages for up-to-date files
3646b3c

Rollup merge ofrust-lang#60763- matklad:tt-parser, r=petrochenkov
b16116b
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

Rollup merge ofrust-lang#60811- wesleywiser:bump_measureme, r=varkor
c5981b2
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.

Rollup merge ofrust-lang#60831- alexcrichton:update-llvm-project, r…
a8fa79a
…=nikic Update LLVM to fix assertion when compiling to wasm More details can be found in rust-lang#60540! Closesrust-lang#60540

Rollup merge ofrust-lang#60832- petrochenkov:CLazy, r=Mark-Simulacrum
adb05d1
CMake: Do not print installation messages for up-to-date files Closesrust-lang#60830

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 15, 2019

Centril closed this May 15, 2019

Centril deleted the rollup-ancb0e4 branch May 15, 2019 00:03

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #60843

Rollup of 6 pull requests#60843
Centril wants to merge 48 commits into
rust-lang:masterfrom
Centril:rollup-ancb0e4

Centril commented May 15, 2019

Uh oh!

Centril commented May 15, 2019

Uh oh!

bors commented May 15, 2019

Uh oh!

rust-highfive commented May 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

Centril commented May 15, 2019

Uh oh!

Centril commented May 15, 2019

Uh oh!

bors commented May 15, 2019

Uh oh!

rust-highfive commented May 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants