Rollup of 4 pull requests #64954

Centril · 2019-10-01T12:06:58Z

Successful merges:

Add long error explanation for E0495 #64404 (Add long error explanation for E0495)
REPL, part 1: Added interpreter mode to compiler interface, interpreter parsing functionality #64648 (REPL, part 1: Added interpreter mode to compiler interface, interpreter parsing functionality)
[const-prop] Handle remaining MIR Rvalue cases #64890 ([const-prop] Handle remaining MIR Rvalue cases)
syntax: cleanup param, method, and misc parsing #64910 (syntax: cleanup param, method, and misc parsing)

Failed merges:

…ctionality

Add long error explanation for E0495 Part of rust-lang#61137.

@Centril

…crum REPL, part 1: Added interpreter mode to compiler interface, interpreter parsing functionality Summary: * Adds "interpreter mode" to compiler interface. This will be used later in several places, including diagnostics. * Adds "interpreter tag" to `ast::Local`s to track info like whether they came from a previous eval session or have been moved. * Added interface for injecting a pre-parsed "user body" into the parsing pipeline. cf. `TyCtxt::get_interp_user_fn`, `expr.rs` * Moved `Steal` data structure to `rustc_data_structures` crate since a) it was already used outside of `rustc::ty` crate, b) it's now used even a little more outside there. * Made a few more things `pub` (as little as possible), so the interpreter can use them. If you want the big picture of where this is going in terms of compiler changes (probably 2/3 more PRs needed), take a look at my [personal branch](https://github.com/alexreg/rust/tree/rush). I will also be publishing the REPL repo itself soon. Also, sorry for the lack of commits; I basically just carved this out of an even bigger squashed commit after much, much hacking! (It might be a tad heavy on cosmetic stuff too, for the same reason. If it's okay, then great, otherwise I can try to revert certain areas that people really don't want.) Maybe @Centril / @Zoxc for review? Not wholly sure. CC @nikomatsakis @mw @eddyb

@oli-obk

…i-obk [const-prop] Handle remaining MIR Rvalue cases r? @oli-obk

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

Centril · 2019-10-01T12:07:13Z

@bors r+ p=4 rollup=never

bors · 2019-10-01T12:07:15Z

📌 Commit 2082027 has been approved by Centril

bors · 2019-10-01T12:07:59Z

⌛ Testing commit 2082027 with merge 47db9758f957378c141896c4fd62e27fddf21f49...

rust-highfive · 2019-10-01T12:18:33Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-10-01T12:17:41.5748603Z [RUSTC-TIMING] tidy test:false 0.663
2019-10-01T12:17:41.5768336Z     Finished release [optimized] target(s) in 1m 26s
2019-10-01T12:17:41.5894709Z [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 86.459
2019-10-01T12:17:41.5897238Z tidy check
2019-10-01T12:17:42.2159260Z tidy error: /checkout/src/librustc/ty/context.rs: too many lines (3016) (add `// ignore-tidy-filelength` to the file to suppress this error)
2019-10-01T12:17:43.4862929Z some tidy checks failed
2019-10-01T12:17:43.4864846Z 
2019-10-01T12:17:43.4864846Z 
2019-10-01T12:17:43.4867677Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-10-01T12:17:43.4867916Z 
2019-10-01T12:17:43.4867952Z 
2019-10-01T12:17:43.4880878Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-10-01T12:17:43.4881182Z Build completed unsuccessfully in 0:01:29
2019-10-01T12:17:43.4881182Z Build completed unsuccessfully in 0:01:29
2019-10-01T12:17:43.4930233Z == clock drift check ==
2019-10-01T12:17:43.4943728Z   local time: Tue Oct  1 12:17:43 UTC 2019
2019-10-01T12:17:44.3649034Z   network time: Tue, 01 Oct 2019 12:17:44 GMT
2019-10-01T12:17:44.3651949Z == end clock drift check ==
2019-10-01T12:17:45.7407749Z ##[error]Bash exited with code '1'.
2019-10-01T12:17:45.7461774Z ##[section]Starting: Upload CPU usage statistics
2019-10-01T12:17:45.7465063Z ==============================================================================
2019-10-01T12:17:45.7465138Z Task         : Bash
2019-10-01T12:17:45.7465214Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

bors · 2019-10-01T12:18:47Z

💔 Test failed - checks-azure

rust-highfive · 2019-10-01T12:28:05Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-10-01T12:08:47.6930626Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-01T12:08:47.7128904Z ##[command]git config gc.auto 0
2019-10-01T12:08:47.7186061Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-01T12:08:47.7246075Z ##[command]git config --get-all http.proxy
2019-10-01T12:08:47.7391974Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64954/merge:refs/remotes/pull/64954/merge
---
2019-10-01T12:15:31.1351214Z    Compiling serde_json v1.0.40
2019-10-01T12:15:32.9717610Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-10-01T12:15:43.8017695Z     Finished release [optimized] target(s) in 1m 28s
2019-10-01T12:15:43.8091338Z tidy check
2019-10-01T12:15:44.4095115Z tidy error: /checkout/src/librustc/ty/context.rs: too many lines (3016) (add `// ignore-tidy-filelength` to the file to suppress this error)
2019-10-01T12:15:45.6450266Z some tidy checks failed
2019-10-01T12:15:45.6459302Z 
2019-10-01T12:15:45.6459302Z 
2019-10-01T12:15:45.6460431Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-10-01T12:15:45.6500770Z 
2019-10-01T12:15:45.6501003Z 
2019-10-01T12:15:45.6501296Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-10-01T12:15:45.6501508Z Build completed unsuccessfully in 0:01:32
2019-10-01T12:15:45.6501508Z Build completed unsuccessfully in 0:01:32
2019-10-01T12:15:45.6522739Z == clock drift check ==
2019-10-01T12:15:45.6543851Z   local time: Tue Oct  1 12:15:45 UTC 2019
2019-10-01T12:15:45.7509504Z   network time: Tue, 01 Oct 2019 12:15:45 GMT
2019-10-01T12:15:45.7513992Z == end clock drift check ==
2019-10-01T12:15:47.0044832Z ##[error]Bash exited with code '1'.
2019-10-01T12:15:47.0082370Z ##[section]Starting: Checkout
2019-10-01T12:15:47.0084662Z ==============================================================================
2019-10-01T12:15:47.0084719Z Task         : Get sources
2019-10-01T12:15:47.0084785Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

wesleywiser and others added 30 commits September 29, 2019 01:43

[const-prop] Handle MIR Rvalue::Repeat

d2c0d10

syntax: cleanup method parsing.

f290467

syntax: is_named_argument -> is_named_param.

378cc98

syntax refactor parse_fn_params

4fa9c3b

syntax refactor parse_self_param (1)

40dc9da

syntax refactor parse_self_param (2)

f688f8a

syntax refactor parse_self_param (3)

ac454e9

syntax refactor parse_self_param (4)

4306d00

syntax refactor parse_self_param (5)

0492302

syntax: reorder param parsing to make more sense.

347deac

syntax: cleanup parse_fn_decl.

d9d0e5d

syntax: misc cleanup

5b80ead

syntax: cleanup parse_visibility.

66bf323

syntax: extract error_on_invalid_abi.

573a8d8

syntax: fuse more code paths together.

258e86a

syntax: stylistic cleanup in item parsing.

bea404f

syntax: reduce repetition in fn parsing.

151ce96

[const-prop] Handle MIR Rvalue::Aggregates

85f2945

[const-prop] Handle MIR Rvalue::Discriminant

ea78010

[const-prop] Handle MIR Rvalue::Box

b3234a3

Cleanup const_prop() some

5804c3b

Added interpreter mode to compiler interface, interpreter parsing fun…

7062164

…ctionality

syntax: document some methods.

df298b4

syntax: put helpers of parse_self_param in the method.

30647d1

syntax: merge things back into parse_visibility.

49780d2

syntax: de-closure-ify check_or_expected.

e046904

syntax: reformat passing of FnHeader to parse_item_fn.

5c5dd80

Add long error explanation for E0495

3237ded

update ui tests

be89e52

Rollup merge of rust-lang#64404 - GuillaumeGomez:err-E0495, r=cramertj

7607459

Add long error explanation for E0495 Part of rust-lang#61137.

Centril added 3 commits October 1, 2019 14:06

Rollup merge of rust-lang#64890 - wesleywiser:const_prop_rvalue, r=ol…

aab99cf

…i-obk [const-prop] Handle remaining MIR Rvalue cases r? @oli-obk

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 1, 2019

Centril mentioned this pull request Oct 1, 2019

REPL, part 1: Added interpreter mode to compiler interface, interpreter parsing functionality #64648

Closed

Centril closed this Oct 1, 2019

Centril deleted the rollup-suhbsrh branch October 1, 2019 12:21

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #64954

Rollup of 4 pull requests #64954

Centril commented Oct 1, 2019

Centril commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

Rollup of 4 pull requests #64954

Rollup of 4 pull requests #64954

Conversation

Centril commented Oct 1, 2019

Centril commented Oct 1, 2019

bors commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019

bors commented Oct 1, 2019

rust-highfive commented Oct 1, 2019