Rollup of 5 pull requests #64958

Centril · 2019-10-01T14:10:31Z

Successful merges:

apfloat: improve doc comments #63416 (apfloat: improve doc comments)
Add long error explanation for E0495 #64404 (Add long error explanation for E0495)
syntax: cleanup param, method, and misc parsing #64910 (syntax: cleanup param, method, and misc parsing)
Remove unneeded fn main blocks from docs #64912 (Remove unneeded fn main blocks from docs)
Update cargo. #64952 (Update cargo.)

Failed merges:

r? @ghost

@eddyb

apfloat: improve doc comments r? @eddyb @nagisa

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

@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

…chievink Remove unneeded `fn main` blocks from docs ## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)

@alexcrichton

…excrichton Update cargo. Pulls rust-lang/cargo@f3c92ed into nightly Rust. r? @alexcrichton

Centril · 2019-10-01T14:10:57Z

@bors r+ p=5 rollup=never

bors · 2019-10-01T14:10:58Z

📌 Commit 98344d7 has been approved by Centril

bors · 2019-10-01T14:11:28Z

⌛ Testing commit 98344d7 with merge 8d0ebb2...

@ghost

Rollup of 5 pull requests Successful merges: - #63416 (apfloat: improve doc comments) - #64404 (Add long error explanation for E0495) - #64910 (syntax: cleanup param, method, and misc parsing) - #64912 (Remove unneeded `fn main` blocks from docs) - #64952 (Update cargo.) Failed merges: r? @ghost

bors · 2019-10-01T16:21:03Z

💔 Test failed - checks-azure

rust-highfive · 2019-10-01T16:21:04Z

The job x86_64-gnu-nopt 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-01T16:19:41.9786459Z 25 
2019-10-01T16:19:41.9786487Z 
2019-10-01T16:19:41.9786549Z 
2019-10-01T16:19:41.9786605Z The actual stderr differed from the expected stderr.
2019-10-01T16:19:41.9786948Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll/mismatched_trait_impl.nll.stderr
2019-10-01T16:19:41.9787230Z To update references, rerun the tests and pass the `--bless` flag
2019-10-01T16:19:41.9787528Z To only update this specific test, also pass `--test-args in-band-lifetimes/mismatched_trait_impl.rs`
2019-10-01T16:19:41.9787669Z error: 1 errors occurred comparing output.
2019-10-01T16:19:41.9787730Z status: exit code: 1
2019-10-01T16:19:41.9787730Z status: exit code: 1
2019-10-01T16:19:41.9788530Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll" "-Zborrowck=mir" "-Crpath" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/in-band-lifetimes/mismatched_trait_impl.nll/auxiliary" "-A" "unused"
2019-10-01T16:19:41.9789000Z ------------------------------------------
2019-10-01T16:19:41.9789044Z 
2019-10-01T16:19:41.9789265Z ------------------------------------------
2019-10-01T16:19:41.9790042Z stderr:
2019-10-01T16:19:41.9790042Z stderr:
2019-10-01T16:19:41.9790402Z ------------------------------------------
2019-10-01T16:19:41.9790763Z error[E0495]: cannot infer an appropriate lifetime for lifetime parameter 'a in generic type due to conflicting requirements
2019-10-01T16:19:41.9791219Z    |
2019-10-01T16:19:41.9791219Z    |
2019-10-01T16:19:41.9791660Z LL |     fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer
2019-10-01T16:19:41.9791875Z    |
2019-10-01T16:19:41.9791875Z    |
2019-10-01T16:19:41.9791983Z note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 9:5...
2019-10-01T16:19:41.9792429Z    |
2019-10-01T16:19:41.9792429Z    |
2019-10-01T16:19:41.9792720Z LL | /     fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer
2019-10-01T16:19:41.9792837Z LL | |         x //~ ERROR lifetime mismatch
2019-10-01T16:19:41.9793155Z    | |_____^
2019-10-01T16:19:41.9793155Z    | |_____^
2019-10-01T16:19:41.9793608Z note: ...but the lifetime must also be valid for the lifetime 'a as defined on the method body at 9:32...
2019-10-01T16:19:41.9793937Z    |
2019-10-01T16:19:41.9793937Z    |
2019-10-01T16:19:41.9794164Z LL |     fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer
2019-10-01T16:19:41.9794336Z    = note: ...so that the method type is compatible with trait:
2019-10-01T16:19:41.9794336Z    = note: ...so that the method type is compatible with trait:
2019-10-01T16:19:41.9794555Z            expected fn(&i32, &'a u32, &u32) -> &'a u32
2019-10-01T16:19:41.9794792Z               found fn(&i32, &u32, &u32) -> &u32
2019-10-01T16:19:41.9795073Z error: aborting due to previous error
2019-10-01T16:19:41.9795111Z 
2019-10-01T16:19:41.9795330Z For more information about this error, try `rustc --explain E0495`.
2019-10-01T16:19:41.9795403Z 
---
2019-10-01T16:19:41.9830995Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-10-01T16:19:41.9831166Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-01T16:19:41.9847030Z 
2019-10-01T16:19:41.9847133Z 
2019-10-01T16:19:41.9850124Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.40.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" "--compare-mode" "nll"
2019-10-01T16:19:41.9851102Z 
2019-10-01T16:19:41.9851142Z 
2019-10-01T16:19:41.9855092Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-10-01T16:19:41.9855207Z Build completed unsuccessfully in 1:51:47
2019-10-01T16:19:41.9855207Z Build completed unsuccessfully in 1:51:47
2019-10-01T16:19:41.9907008Z == clock drift check ==
2019-10-01T16:19:41.9926360Z   local time: Tue Oct  1 16:19:41 UTC 2019
2019-10-01T16:19:42.0637918Z   network time: Tue, 01 Oct 2019 16:19:42 GMT
2019-10-01T16:19:42.0638058Z == end clock drift check ==
2019-10-01T16:19:42.9266946Z ##[error]Bash exited with code '1'.
2019-10-01T16:19:42.9303548Z ##[section]Starting: Upload CPU usage statistics
2019-10-01T16:19:42.9309838Z ==============================================================================
2019-10-01T16:19:42.9309977Z Task         : Bash
2019-10-01T16:19:42.9310073Z 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)

RalfJung and others added 30 commits August 9, 2019 19:33

apfloat: improve doc comments

5faae38

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

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

Update cargo.

e1d9f82

Remove unneeded fn main blocks from docs

6c1b447

Update Cargo.lock for cargo update

3173a09

Rollup merge of rust-lang#63416 - RalfJung:apfloat, r=eddyb

185f8a9

apfloat: improve doc comments r? @eddyb @nagisa

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

fd6212a

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

Centril added 2 commits October 1, 2019 16:10

Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…

b69acfa

…chievink Remove unneeded `fn main` blocks from docs ## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)

Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…

98344d7

…excrichton Update cargo. Pulls rust-lang/cargo@f3c92ed into nightly Rust. r? @alexcrichton

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

tmandry mentioned this pull request Oct 1, 2019

Add long error explanation for E0495 #64404

Merged

tmandry closed this Oct 1, 2019

Centril deleted the rollup-8k5m97o branch October 1, 2019 21:13

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

Uh oh!

Rollup of 5 pull requests #64958

Rollup of 5 pull requests #64958

Uh oh!

Centril commented Oct 1, 2019

Uh oh!

Centril commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

rust-highfive commented Oct 1, 2019

Uh oh!

Uh oh!

Rollup of 5 pull requests #64958

Rollup of 5 pull requests #64958

Uh oh!

Conversation

Centril commented Oct 1, 2019

Uh oh!

Centril commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

bors commented Oct 1, 2019

Uh oh!

rust-highfive commented Oct 1, 2019

Uh oh!

Uh oh!