Rollup of 4 pull requests #64951

Centril · 2019-10-01T11:53:04Z

Successful merges:

Fix unreachable_code warnings for try{} block ok-wrapped expressions #64581 (Fix unreachable_code warnings for try{} block ok-wrapped expressions)
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:

SelfProfiler API refactoring and part one of event review #64840 (SelfProfiler API refactoring and part one of event review)

…ctionality

…ode, r=Centril Fix unreachable_code warnings for try{} block ok-wrapped expressions Fixes rust-lang#54165 and fixes rust-lang#63324.

@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-01T11:53:23Z

@bors r+ p=4 rollup=never

bors · 2019-10-01T11:53:24Z

📌 Commit c0e0a32 has been approved by Centril

bors · 2019-10-01T11:54:24Z

⌛ Testing commit c0e0a32 with merge 8d077f05987172cbff47f6993fbc19b20157c501...

rust-highfive · 2019-10-01T12:03:41Z

The job mingw-check 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-01T11:53:46.4363427Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-01T11:53:46.4558634Z ##[command]git config gc.auto 0
2019-10-01T11:53:46.4640591Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-01T11:53:46.4700890Z ##[command]git config --get-all http.proxy
2019-10-01T11:53:46.4837736Z ##[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/64951/merge:refs/remotes/pull/64951/merge
---
2019-10-01T12:03:19.5977860Z == clock drift check ==
2019-10-01T12:03:19.5996191Z   local time: Tue Oct  1 12:03:19 UTC 2019
2019-10-01T12:03:19.7672158Z   network time: Tue, 01 Oct 2019 12:03:19 GMT
2019-10-01T12:03:19.7675407Z == end clock drift check ==
2019-10-01T12:03:20.9192880Z ##[error]Bash exited with code '1'.
2019-10-01T12:03:20.9241545Z ##[section]Starting: Checkout
2019-10-01T12:03:20.9243899Z ==============================================================================
2019-10-01T12:03:20.9243963Z Task         : Get sources
2019-10-01T12:03:20.9244018Z 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)

bors · 2019-10-01T12:05:33Z

💔 Test failed - checks-azure

rust-highfive · 2019-10-01T12:05: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:02:24.0620536Z [RUSTC-TIMING] tidy test:false 0.700
2019-10-01T12:02:24.0642156Z     Finished release [optimized] target(s) in 1m 33s
2019-10-01T12:02:24.0745748Z [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: [] } -- 93.711
2019-10-01T12:02:24.0745970Z tidy check
2019-10-01T12:02:24.7832394Z 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:02:26.1152820Z some tidy checks failed
2019-10-01T12:02:26.1155742Z 
2019-10-01T12:02:26.1155742Z 
2019-10-01T12:02:26.1156807Z 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:02:26.1157058Z 
2019-10-01T12:02:26.1157112Z 
2019-10-01T12:02:26.1166724Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-10-01T12:02:26.1167733Z Build completed unsuccessfully in 0:01:37
2019-10-01T12:02:26.1167733Z Build completed unsuccessfully in 0:01:37
2019-10-01T12:02:26.1219644Z == clock drift check ==
2019-10-01T12:02:26.1235887Z   local time: Tue Oct  1 12:02:26 UTC 2019
2019-10-01T12:02:26.2724083Z   network time: Tue, 01 Oct 2019 12:02:26 GMT
2019-10-01T12:02:26.2729484Z == end clock drift check ==
2019-10-01T12:02:27.5802551Z ##[error]Bash exited with code '1'.
2019-10-01T12:02:27.5844708Z ##[section]Starting: Upload CPU usage statistics
2019-10-01T12:02:27.5849049Z ==============================================================================
2019-10-01T12:02:27.5849183Z Task         : Bash
2019-10-01T12:02:27.5849629Z 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)

ztlpn and others added 30 commits September 22, 2019 14:46

fix typo

1d704e7

fix spurious unreachable_code lints for try{} block ok-wrapping

3f85ff4

add tests

c60c0cb

address review comments

65251ea

fix test after rebase

58eacaa

[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

Centril added 6 commits October 1, 2019 05:55

syntax: de-closure-ify check_or_expected.

e046904

syntax: reformat passing of FnHeader to parse_item_fn.

5c5dd80

Rollup merge of rust-lang#64581 - ztlpn:fix-ok-wrapping-unreachable-c…

e463a22

…ode, r=Centril Fix unreachable_code warnings for try{} block ok-wrapped expressions Fixes rust-lang#54165 and fixes rust-lang#63324.

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

8436080

…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 closed this Oct 1, 2019

Centril deleted the rollup-kvau8u0 branch October 1, 2019 12:05

Centril mentioned this pull request Oct 1, 2019

Fix unreachable_code warnings for try{} block ok-wrapped expressions #64581

Merged

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 #64951

Rollup of 4 pull requests #64951

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 #64951

Rollup of 4 pull requests #64951

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