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.

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

Cleanup: Consistently use Param instead of Arg #62426 #63127

Merged
merged 2 commits into from Aug 28, 2019
Merged

Cleanup: Consistently use Param instead of Arg #62426 #63127

merged 2 commits into from Aug 28, 2019

Conversation

kper
Copy link
Contributor

@kper kper commented Jul 30, 2019

Fixes #62426

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2019
@rust-highfive

This comment has been minimized.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-07-30T15:24:43.5949524Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-30T15:24:43.6123742Z ##[command]git config gc.auto 0
2019-07-30T15:24:44.1811160Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-30T15:24:44.1815423Z ##[command]git config --get-all http.proxy
2019-07-30T15:24:44.1820651Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-07-30T15:25:17.6902697Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-30T15:25:17.6902861Z 
2019-07-30T15:25:17.6915942Z   git checkout -b <new-branch-name>
2019-07-30T15:25:17.6916372Z 
2019-07-30T15:25:17.6917079Z HEAD is now at f413af835 Merge bef8be3dc73b904c4a8ef55cd9716c4029e44334 into f690098e6d65ad7b33dc7fdefccc387806782027
2019-07-30T15:25:17.7067551Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-30T15:25:17.7070969Z ==============================================================================
2019-07-30T15:25:17.7071017Z Task         : Bash
2019-07-30T15:25:17.7071054Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-30T15:31:02.2308940Z    Compiling serde_json v1.0.40
2019-07-30T15:31:06.2671249Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-07-30T15:31:14.4843843Z     Finished release [optimized] target(s) in 1m 24s
2019-07-30T15:31:14.4913219Z tidy check
2019-07-30T15:31:14.7973648Z tidy error: /checkout/src/librustc/hir/lowering.rs:353: trailing whitespace
2019-07-30T15:31:14.7980708Z tidy error: /checkout/src/librustc/hir/lowering.rs:3279: line longer than 100 chars
2019-07-30T15:31:14.8151325Z tidy error: /checkout/src/librustc/traits/error_reporting.rs:1047: line longer than 100 chars
2019-07-30T15:31:16.2976465Z some tidy checks failed
2019-07-30T15:31:16.2981885Z 
2019-07-30T15:31:16.2981885Z 
2019-07-30T15:31:16.3007243Z 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-07-30T15:31:16.3007903Z 
2019-07-30T15:31:16.3007931Z 
2019-07-30T15:31:16.3027764Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-07-30T15:31:16.3027852Z Build completed unsuccessfully in 0:01:27
2019-07-30T15:31:16.3027852Z Build completed unsuccessfully in 0:01:27
2019-07-30T15:31:17.5872316Z ##[error]Bash exited with code '1'.
2019-07-30T15:31:17.5903447Z ##[section]Starting: Checkout
2019-07-30T15:31:17.5905046Z ==============================================================================
2019-07-30T15:31:17.5905091Z Task         : Get sources
2019-07-30T15:31:17.5905144Z 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)

src/librustc/hir/mod.rs Outdated Show resolved Hide resolved
src/librustc_metadata/cstore_impl.rs Show resolved Hide resolved
src/librustc_typeck/collect.rs Outdated Show resolved Hide resolved
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-07-30T15:57:33.4391189Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-30T15:57:33.4566415Z ##[command]git config gc.auto 0
2019-07-30T15:57:33.4625121Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-30T15:57:33.4669053Z ##[command]git config --get-all http.proxy
2019-07-30T15:57:33.4783449Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-07-30T15:58:08.3198062Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-30T15:58:08.3198094Z 
2019-07-30T15:58:08.3198322Z   git checkout -b <new-branch-name>
2019-07-30T15:58:08.3198352Z 
2019-07-30T15:58:08.3198420Z HEAD is now at d9aa6faa3 Merge 5f155f103f1b6ce1aef11a22f2f34450ff40558a into f690098e6d65ad7b33dc7fdefccc387806782027
2019-07-30T15:58:08.3320254Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-30T15:58:08.3323001Z ==============================================================================
2019-07-30T15:58:08.3323044Z Task         : Bash
2019-07-30T15:58:08.3323077Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-30T16:03:50.0321046Z    Compiling serde_json v1.0.40
2019-07-30T16:03:53.8187490Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-07-30T16:04:01.6267000Z     Finished release [optimized] target(s) in 1m 21s
2019-07-30T16:04:01.6355934Z tidy check
2019-07-30T16:04:01.7562835Z tidy error: /checkout/src/librustc_typeck/astconv.rs:254: trailing whitespace
2019-07-30T16:04:01.8794900Z tidy error: /checkout/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs:567: line longer than 100 chars
2019-07-30T16:04:01.9115067Z tidy error: /checkout/src/librustc/middle/resolve_lifetime.rs:1913: line longer than 100 chars
2019-07-30T16:04:03.2999766Z some tidy checks failed
2019-07-30T16:04:03.2999885Z 
2019-07-30T16:04:03.2999885Z 
2019-07-30T16:04:03.3007046Z 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-07-30T16:04:03.3007555Z 
2019-07-30T16:04:03.3007655Z 
2019-07-30T16:04:03.3007820Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-07-30T16:04:03.3007965Z Build completed unsuccessfully in 0:01:24
2019-07-30T16:04:03.3007965Z Build completed unsuccessfully in 0:01:24
2019-07-30T16:04:04.8028651Z ##[error]Bash exited with code '1'.
2019-07-30T16:04:04.8058059Z ##[section]Starting: Checkout
2019-07-30T16:04:04.8059434Z ==============================================================================
2019-07-30T16:04:04.8059488Z Task         : Get sources
2019-07-30T16:04:04.8059525Z 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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-07-31T06:29:18.0498919Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-31T06:29:18.0705745Z ##[command]git config gc.auto 0
2019-07-31T06:29:18.0789853Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-31T06:29:18.0849546Z ##[command]git config --get-all http.proxy
2019-07-31T06:29:18.7686253Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-07-31T06:29:54.6191935Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-31T06:29:54.6191973Z 
2019-07-31T06:29:54.6192212Z   git checkout -b <new-branch-name>
2019-07-31T06:29:54.6192245Z 
2019-07-31T06:29:54.6192299Z HEAD is now at 49faceba2 Merge 71a66ff6e0770e0d4b43f3a87d5720b10eaf1049 into 4a18848e05b0957474fdb5be162502742b5eb9fd
2019-07-31T06:29:54.6325725Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-31T06:29:54.6328496Z ==============================================================================
2019-07-31T06:29:54.6328549Z Task         : Bash
2019-07-31T06:29:54.6328625Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-31T07:33:33.7591514Z .................................................................................................... 1400/8819
2019-07-31T07:33:39.8753404Z .................................................................................................... 1500/8819
2019-07-31T07:33:53.0039754Z .................................................................i...............i.................. 1600/8819
2019-07-31T07:34:00.7890261Z .................................................................................................... 1700/8819
2019-07-31T07:34:16.3915648Z ...................................................iiiii............................................ 1800/8819
2019-07-31T07:34:28.0053481Z .................................................................................................... 2000/8819
2019-07-31T07:34:30.6565489Z .................................................................................................... 2100/8819
2019-07-31T07:34:34.4732077Z .................................................................................................... 2200/8819
2019-07-31T07:34:41.2355966Z .................................................................................................... 2300/8819
---
2019-07-31T07:38:46.0078881Z .................................................................................................... 5300/8819
2019-07-31T07:38:53.7013998Z ..............i..................................................................................... 5400/8819
2019-07-31T07:38:59.5068145Z .................................................................................................... 5500/8819
2019-07-31T07:39:12.3586238Z .................................................................................................... 5600/8819
2019-07-31T07:39:26.9841578Z ........ii...i..ii...........i...................................................................... 5700/8819
2019-07-31T07:39:42.2075028Z .................................................................................................... 5900/8819
2019-07-31T07:39:47.2689238Z .................................................................................................... 6000/8819
2019-07-31T07:39:47.2689238Z .................................................................................................... 6000/8819
2019-07-31T07:40:01.8824792Z ........i..ii....................................................................................... 6100/8819
2019-07-31T07:40:21.6647458Z ....................................................i............................................... 6300/8819
2019-07-31T07:40:23.9023541Z .................................................................................................... 6400/8819
2019-07-31T07:40:26.4883887Z .....................i.............................................................................. 6500/8819
2019-07-31T07:40:31.1696809Z .................................................................................................... 6600/8819
---
2019-07-31T07:44:35.2162422Z 
2019-07-31T07:44:35.2163229Z ---- [ui] ui/async-await/no-args-non-move-async-closure.rs stdout ----
2019-07-31T07:44:35.2163290Z diff of stderr:
2019-07-31T07:44:35.2163478Z 
2019-07-31T07:44:35.2163882Z - error[E0708]: `async` non-`move` closures with arguments are not currently supported
2019-07-31T07:44:35.2164338Z + error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T07:44:35.2164990Z 3    |
2019-07-31T07:44:35.2164990Z 3    |
2019-07-31T07:44:35.2165104Z 4 LL |     let _ = async |x: u8| {};
2019-07-31T07:44:35.2165527Z 
2019-07-31T07:44:35.2165584Z The actual stderr differed from the expected stderr.
2019-07-31T07:44:35.2166023Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T07:44:35.2166023Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T07:44:35.2166289Z To update references, rerun the tests and pass the `--bless` flag
2019-07-31T07:44:35.2166979Z To only update this specific test, also pass `--test-args async-await/no-args-non-move-async-closure.rs`
2019-07-31T07:44:35.2167090Z error: 1 errors occurred comparing output.
2019-07-31T07:44:35.2167136Z status: exit code: 1
2019-07-31T07:44:35.2167136Z status: exit code: 1
2019-07-31T07:44:35.2167934Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/no-args-non-move-async-closure.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/async-await/no-args-non-move-async-closure" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/auxiliary" "-A" "unused"
2019-07-31T07:44:35.2168300Z ------------------------------------------
2019-07-31T07:44:35.2168333Z 
2019-07-31T07:44:35.2168552Z ------------------------------------------
2019-07-31T07:44:35.2168597Z stderr:
2019-07-31T07:44:35.2168597Z stderr:
2019-07-31T07:44:35.2168823Z ------------------------------------------
2019-07-31T07:44:35.2169077Z error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T07:44:35.2169603Z    |
2019-07-31T07:44:35.2169603Z    |
2019-07-31T07:44:35.2169646Z LL |     let _ = async |x: u8| {};
2019-07-31T07:44:35.2169742Z    |
2019-07-31T07:44:35.2169742Z    |
2019-07-31T07:44:35.2169795Z    = help: consider using `let` statements to manually capture variables by reference before entering an `async move` closure
2019-07-31T07:44:35.2187744Z error: aborting due to previous error
2019-07-31T07:44:35.2187776Z 
2019-07-31T07:44:35.2187801Z 
2019-07-31T07:44:35.2188400Z ------------------------------------------
2019-07-31T07:44:35.2188400Z ------------------------------------------
2019-07-31T07:44:35.2188447Z 
2019-07-31T07:44:35.2188473Z 
2019-07-31T07:44:35.2188772Z ---- [ui] ui/generator/no-arguments-on-generators.rs stdout ----
2019-07-31T07:44:35.2188845Z diff of stderr:
2019-07-31T07:44:35.2188873Z 
2019-07-31T07:44:35.2189113Z - error[E0628]: generators cannot have explicit arguments
2019-07-31T07:44:35.2189165Z + error[E0628]: generators cannot have explicit parameters
2019-07-31T07:44:35.2189871Z 3    |
2019-07-31T07:44:35.2189871Z 3    |
2019-07-31T07:44:35.2189914Z 4 LL |     let gen = |start| {
2019-07-31T07:44:35.2189983Z 
2019-07-31T07:44:35.2190028Z The actual stderr differed from the expected stderr.
2019-07-31T07:44:35.2190658Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-arguments-on-generators/no-arguments-on-generators.stderr
2019-07-31T07:44:35.2190658Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-arguments-on-generators/no-arguments-on-generators.stderr
2019-07-31T07:44:35.2191178Z To update references, rerun the tests and pass the `--bless` flag
2019-07-31T07:44:35.2191730Z To only update this specific test, also pass `--test-args generator/no-arguments-on-generators.rs`
2019-07-31T07:44:35.2191833Z error: 1 errors occurred comparing output.
2019-07-31T07:44:35.2191880Z status: exit code: 1
2019-07-31T07:44:35.2191880Z status: exit code: 1
2019-07-31T07:44:35.2237708Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/generator/no-arguments-on-generators.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/generator/no-arguments-on-generators" "-Crpath" "-O" "-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/generator/no-arguments-on-generators/auxiliary" "-A" "unused"
2019-07-31T07:44:35.2238399Z ------------------------------------------
2019-07-31T07:44:35.2238445Z 
2019-07-31T07:44:35.2238712Z ------------------------------------------
2019-07-31T07:44:35.2238764Z stderr:
2019-07-31T07:44:35.2238764Z stderr:
2019-07-31T07:44:35.2239018Z ------------------------------------------
2019-07-31T07:44:35.2239076Z error[E0628]: generators cannot have explicit parameters
2019-07-31T07:44:35.2239434Z    |
2019-07-31T07:44:35.2239434Z    |
2019-07-31T07:44:35.2239502Z LL |     let gen = |start| { //~ ERROR generators cannot have explicit arguments
2019-07-31T07:44:35.2239607Z 
2019-07-31T07:44:35.2239656Z error: aborting due to previous error
2019-07-31T07:44:35.2239689Z 
2019-07-31T07:44:35.2239717Z 
---
2019-07-31T07:44:35.2241399Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:533:22
2019-07-31T07:44:35.2241465Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-07-31T07:44:35.2252301Z 
2019-07-31T07:44:35.2252486Z 
2019-07-31T07:44:35.2254652Z 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" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-07-31T07:44:35.2255025Z 
2019-07-31T07:44:35.2255069Z 
2019-07-31T07:44:35.2267845Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-07-31T07:44:35.2267927Z Build completed unsuccessfully in 1:07:43
2019-07-31T07:44:35.2267927Z Build completed unsuccessfully in 1:07:43
2019-07-31T07:44:36.0005430Z ##[error]Bash exited with code '1'.
2019-07-31T07:44:36.0053036Z ##[section]Starting: Checkout
2019-07-31T07:44:36.0054965Z ==============================================================================
2019-07-31T07:44:36.0055061Z Task         : Get sources
2019-07-31T07:44:36.0055113Z 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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-07-31T16:25:28.1364145Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-31T16:25:28.1547254Z ##[command]git config gc.auto 0
2019-07-31T16:25:28.1632446Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-31T16:25:28.1699731Z ##[command]git config --get-all http.proxy
2019-07-31T16:25:28.1839208Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-07-31T16:26:04.3349399Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-31T16:26:04.3349424Z 
2019-07-31T16:26:04.3349613Z   git checkout -b <new-branch-name>
2019-07-31T16:26:04.3349637Z 
2019-07-31T16:26:04.3349676Z HEAD is now at 100d05c20 Merge 00e00235b6f9f9674039d46bb23bc74373c951bb into 9152fe4ea053a29469691349f4b63aa94c9aac56
2019-07-31T16:26:04.3504762Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-31T16:26:04.3507159Z ==============================================================================
2019-07-31T16:26:04.3507207Z Task         : Bash
2019-07-31T16:26:04.3507245Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-31T17:25:35.0756736Z .................................................................................................... 1400/8819
2019-07-31T17:25:41.0408257Z .................................................................................................... 1500/8819
2019-07-31T17:25:53.7693789Z .................................................................i...............i.................. 1600/8819
2019-07-31T17:26:01.2258979Z .................................................................................................... 1700/8819
2019-07-31T17:26:16.2194189Z ...................................................iiiii............................................ 1800/8819
2019-07-31T17:26:27.5503027Z .................................................................................................... 2000/8819
2019-07-31T17:26:30.0588696Z .................................................................................................... 2100/8819
2019-07-31T17:26:33.6646685Z .................................................................................................... 2200/8819
2019-07-31T17:26:40.2687173Z .................................................................................................... 2300/8819
---
2019-07-31T17:30:38.3046787Z .................................................................................................... 5300/8819
2019-07-31T17:30:45.7949972Z ..............i..................................................................................... 5400/8819
2019-07-31T17:30:51.5500669Z .................................................................................................... 5500/8819
2019-07-31T17:31:03.9313359Z .................................................................................................... 5600/8819
2019-07-31T17:31:17.4521062Z ........ii...i..ii...........i...................................................................... 5700/8819
2019-07-31T17:31:35.8222788Z .................................................................................................... 5900/8819
2019-07-31T17:31:40.6262623Z .................................................................................................... 6000/8819
2019-07-31T17:31:40.6262623Z .................................................................................................... 6000/8819
2019-07-31T17:31:54.5250033Z ........i..ii....................................................................................... 6100/8819
2019-07-31T17:32:14.0482920Z ...................................................i................................................ 6300/8819
2019-07-31T17:32:16.1689356Z .................................................................................................... 6400/8819
2019-07-31T17:32:18.6935124Z .....................i.............................................................................. 6500/8819
2019-07-31T17:32:23.3232074Z .................................................................................................... 6600/8819
---
2019-07-31T17:36:18.1944019Z 
2019-07-31T17:36:18.1944465Z ---- [ui] ui/async-await/no-args-non-move-async-closure.rs stdout ----
2019-07-31T17:36:18.1944513Z diff of stderr:
2019-07-31T17:36:18.1944537Z 
2019-07-31T17:36:18.1944769Z - error[E0708]: `async` non-`move` closures with arguments are not currently supported
2019-07-31T17:36:18.1945012Z + error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T17:36:18.1945262Z 3    |
2019-07-31T17:36:18.1945262Z 3    |
2019-07-31T17:36:18.1945317Z 4 LL |     let _ = async |x: u8| {};
2019-07-31T17:36:18.1945362Z 
2019-07-31T17:36:18.1945398Z The actual stderr differed from the expected stderr.
2019-07-31T17:36:18.1945693Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T17:36:18.1945693Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T17:36:18.1945913Z To update references, rerun the tests and pass the `--bless` flag
2019-07-31T17:36:18.1946320Z To only update this specific test, also pass `--test-args async-await/no-args-non-move-async-closure.rs`
2019-07-31T17:36:18.1946407Z error: 1 errors occurred comparing output.
2019-07-31T17:36:18.1946445Z status: exit code: 1
2019-07-31T17:36:18.1946445Z status: exit code: 1
2019-07-31T17:36:18.1947672Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/no-args-non-move-async-closure.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/async-await/no-args-non-move-async-closure" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/auxiliary" "-A" "unused"
2019-07-31T17:36:18.1948246Z ------------------------------------------
2019-07-31T17:36:18.1948283Z 
2019-07-31T17:36:18.1948509Z ------------------------------------------
2019-07-31T17:36:18.1948556Z stderr:
2019-07-31T17:36:18.1948556Z stderr:
2019-07-31T17:36:18.1948806Z ------------------------------------------
2019-07-31T17:36:18.1949075Z error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T17:36:18.1949498Z    |
2019-07-31T17:36:18.1949498Z    |
2019-07-31T17:36:18.1949647Z LL |     let _ = async |x: u8| {};
2019-07-31T17:36:18.1949767Z    |
2019-07-31T17:36:18.1949767Z    |
2019-07-31T17:36:18.1949821Z    = help: consider using `let` statements to manually capture variables by reference before entering an `async move` closure
2019-07-31T17:36:18.1949927Z error: aborting due to previous error
2019-07-31T17:36:18.1949966Z 
2019-07-31T17:36:18.1949993Z 
2019-07-31T17:36:18.1950545Z ------------------------------------------
2019-07-31T17:36:18.1950545Z ------------------------------------------
2019-07-31T17:36:18.1950573Z 
2019-07-31T17:36:18.1950614Z 
2019-07-31T17:36:18.1950814Z ---- [ui] ui/generator/no-arguments-on-generators.rs stdout ----
2019-07-31T17:36:18.1950855Z diff of stderr:
2019-07-31T17:36:18.1950879Z 
2019-07-31T17:36:18.1951108Z - error[E0628]: generators cannot have explicit arguments
2019-07-31T17:36:18.1951153Z + error[E0628]: generators cannot have explicit parameters
2019-07-31T17:36:18.1951410Z 3    |
2019-07-31T17:36:18.1951410Z 3    |
2019-07-31T17:36:18.1951446Z 4 LL |     let gen = |start| {
2019-07-31T17:36:18.1951492Z 
2019-07-31T17:36:18.1951549Z The actual stderr differed from the expected stderr.
2019-07-31T17:36:18.1951979Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-arguments-on-generators/no-arguments-on-generators.stderr
2019-07-31T17:36:18.1951979Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-arguments-on-generators/no-arguments-on-generators.stderr
2019-07-31T17:36:18.1952193Z To update references, rerun the tests and pass the `--bless` flag
2019-07-31T17:36:18.1952441Z To only update this specific test, also pass `--test-args generator/no-arguments-on-generators.rs`
2019-07-31T17:36:18.1952506Z error: 1 errors occurred comparing output.
2019-07-31T17:36:18.1952542Z status: exit code: 1
2019-07-31T17:36:18.1952542Z status: exit code: 1
2019-07-31T17:36:18.1953176Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/generator/no-arguments-on-generators.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/generator/no-arguments-on-generators" "-Crpath" "-O" "-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/generator/no-arguments-on-generators/auxiliary" "-A" "unused"
2019-07-31T17:36:18.1953459Z ------------------------------------------
2019-07-31T17:36:18.1953487Z 
2019-07-31T17:36:18.1953666Z ------------------------------------------
2019-07-31T17:36:18.1953722Z stderr:
2019-07-31T17:36:18.1953722Z stderr:
2019-07-31T17:36:18.1953900Z ------------------------------------------
2019-07-31T17:36:18.1953941Z error[E0628]: generators cannot have explicit parameters
2019-07-31T17:36:18.1954208Z    |
2019-07-31T17:36:18.1954208Z    |
2019-07-31T17:36:18.1954254Z LL |     let gen = |start| { //~ ERROR generators cannot have explicit parameters
2019-07-31T17:36:18.1954338Z 
2019-07-31T17:36:18.1954373Z error: aborting due to previous error
2019-07-31T17:36:18.1954396Z 
2019-07-31T17:36:18.1954434Z 
---
2019-07-31T17:36:18.1981941Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:533:22
2019-07-31T17:36:18.1982031Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-07-31T17:36:18.1997839Z 
2019-07-31T17:36:18.1997952Z 
2019-07-31T17:36:18.1999741Z 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" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-07-31T17:36:18.2000030Z 
2019-07-31T17:36:18.2000064Z 
2019-07-31T17:36:18.2009593Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-07-31T17:36:18.2010353Z Build completed unsuccessfully in 1:03:39
2019-07-31T17:36:18.2010353Z Build completed unsuccessfully in 1:03:39
2019-07-31T17:36:18.9978761Z ##[error]Bash exited with code '1'.
2019-07-31T17:36:19.0045963Z ##[section]Starting: Checkout
2019-07-31T17:36:19.0048490Z ==============================================================================
2019-07-31T17:36:19.0048547Z Task         : Get sources
2019-07-31T17:36:19.0048616Z 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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-07-31T17:56:05.3212651Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-31T17:56:05.3394760Z ##[command]git config gc.auto 0
2019-07-31T17:56:05.3469838Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-31T17:56:05.3536649Z ##[command]git config --get-all http.proxy
2019-07-31T17:56:05.3685684Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-07-31T17:56:43.1931324Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-31T17:56:43.1931356Z 
2019-07-31T17:56:43.1931573Z   git checkout -b <new-branch-name>
2019-07-31T17:56:43.1931603Z 
2019-07-31T17:56:43.1931670Z HEAD is now at 9fefbfe9b Merge 28e2a9113395af1560121285740ceeed3f257598 into 9152fe4ea053a29469691349f4b63aa94c9aac56
2019-07-31T17:56:43.2086855Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-31T17:56:43.2089724Z ==============================================================================
2019-07-31T17:56:43.2089784Z Task         : Bash
2019-07-31T17:56:43.2089834Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-31T18:58:35.8411596Z .................................................................................................... 1400/8819
2019-07-31T18:58:41.7063920Z .................................................................................................... 1500/8819
2019-07-31T18:58:54.2163069Z .................................................................i...............i.................. 1600/8819
2019-07-31T18:59:01.6589120Z .................................................................................................... 1700/8819
2019-07-31T18:59:16.6934815Z ...................................................iiiii............................................ 1800/8819
2019-07-31T18:59:27.9572885Z .................................................................................................... 2000/8819
2019-07-31T18:59:30.4992332Z .................................................................................................... 2100/8819
2019-07-31T18:59:34.1690238Z .................................................................................................... 2200/8819
2019-07-31T18:59:40.7497208Z .................................................................................................... 2300/8819
---
2019-07-31T19:03:36.5342195Z .................................................................................................... 5300/8819
2019-07-31T19:03:43.9600736Z ..............i..................................................................................... 5400/8819
2019-07-31T19:03:49.5574252Z .................................................................................................... 5500/8819
2019-07-31T19:04:01.9896798Z .................................................................................................... 5600/8819
2019-07-31T19:04:15.6917052Z ........ii...i..ii...........i...................................................................... 5700/8819
2019-07-31T19:04:33.0889149Z .................................................................................................... 5900/8819
2019-07-31T19:04:37.9315737Z .................................................................................................... 6000/8819
2019-07-31T19:04:37.9315737Z .................................................................................................... 6000/8819
2019-07-31T19:04:51.9117741Z ........i..ii....................................................................................... 6100/8819
2019-07-31T19:05:11.0048683Z ...................................................i................................................ 6300/8819
2019-07-31T19:05:13.1674010Z .................................................................................................... 6400/8819
2019-07-31T19:05:15.6107753Z .....................i.............................................................................. 6500/8819
2019-07-31T19:05:20.1357186Z .................................................................................................... 6600/8819
---
2019-07-31T19:09:16.4020115Z 
2019-07-31T19:09:16.4020627Z ---- [ui] ui/async-await/no-args-non-move-async-closure.rs stdout ----
2019-07-31T19:09:16.4020684Z diff of stderr:
2019-07-31T19:09:16.4020710Z 
2019-07-31T19:09:16.4020986Z - error[E0708]: `async` non-`move` closures with paramaters are not currently supported
2019-07-31T19:09:16.4021219Z + error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T19:09:16.4021489Z 3    |
2019-07-31T19:09:16.4021489Z 3    |
2019-07-31T19:09:16.4021529Z 4 LL |     let _ = async |x: u8| {};
2019-07-31T19:09:16.4021577Z 
2019-07-31T19:09:16.4021797Z The actual stderr differed from the expected stderr.
2019-07-31T19:09:16.4022357Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T19:09:16.4022357Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/no-args-non-move-async-closure.stderr
2019-07-31T19:09:16.4022604Z To update references, rerun the tests and pass the `--bless` flag
2019-07-31T19:09:16.4022927Z To only update this specific test, also pass `--test-args async-await/no-args-non-move-async-closure.rs`
2019-07-31T19:09:16.4023014Z error: 1 errors occurred comparing output.
2019-07-31T19:09:16.4023080Z status: exit code: 1
2019-07-31T19:09:16.4023080Z status: exit code: 1
2019-07-31T19:09:16.4023980Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/no-args-non-move-async-closure.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/async-await/no-args-non-move-async-closure" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-args-non-move-async-closure/auxiliary" "-A" "unused"
2019-07-31T19:09:16.4024387Z ------------------------------------------
2019-07-31T19:09:16.4024422Z 
2019-07-31T19:09:16.4024762Z ------------------------------------------
2019-07-31T19:09:16.4024830Z stderr:
2019-07-31T19:09:16.4024830Z stderr:
2019-07-31T19:09:16.4025658Z ------------------------------------------
2019-07-31T19:09:16.4025933Z error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-07-31T19:09:16.4026273Z    |
2019-07-31T19:09:16.4026273Z    |
2019-07-31T19:09:16.4026319Z LL |     let _ = async |x: u8| {};
2019-07-31T19:09:16.4026427Z    |
2019-07-31T19:09:16.4026427Z    |
2019-07-31T19:09:16.4026495Z    = help: consider using `let` statements to manually capture variables by reference before entering an `async move` closure
2019-07-31T19:09:16.4026604Z error: aborting due to previous error
2019-07-31T19:09:16.4026633Z 
2019-07-31T19:09:16.4026659Z 
2019-07-31T19:09:16.4026902Z ------------------------------------------
---
2019-07-31T19:09:16.4071328Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:533:22
2019-07-31T19:09:16.4071407Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-07-31T19:09:16.4088458Z 
2019-07-31T19:09:16.4088665Z 
2019-07-31T19:09:16.4090127Z 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" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-07-31T19:09:16.4090538Z 
2019-07-31T19:09:16.4090567Z 
2019-07-31T19:09:16.4098081Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-07-31T19:09:16.4098195Z Build completed unsuccessfully in 1:05:52
2019-07-31T19:09:16.4098195Z Build completed unsuccessfully in 1:05:52
2019-07-31T19:09:17.2384620Z ##[error]Bash exited with code '1'.
2019-07-31T19:09:17.2439798Z ##[section]Starting: Checkout
2019-07-31T19:09:17.2441692Z ==============================================================================
2019-07-31T19:09:17.2441751Z Task         : Get sources
2019-07-31T19:09:17.2441818Z 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)

@kper
Copy link
Contributor Author

kper commented Aug 2, 2019

Is there anything left to change?

@bors
Copy link
Contributor

bors commented Aug 2, 2019

☔ The latest upstream changes (presumably #63207) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-08-03T07:33:56.9791795Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-03T07:33:57.0033046Z ##[command]git config gc.auto 0
2019-08-03T07:33:57.0102454Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-03T07:33:57.0174771Z ##[command]git config --get-all http.proxy
2019-08-03T07:33:57.0352243Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-08-03T07:34:32.8972903Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-03T07:34:32.8972937Z 
2019-08-03T07:34:32.8973221Z   git checkout -b <new-branch-name>
2019-08-03T07:34:32.8973256Z 
2019-08-03T07:34:32.8973310Z HEAD is now at afe3a840b Merge 17ba4715ca3cf28a9581033c75e483cdb70f6165 into d7270712cb446aad0817040bbca73a8d024f67b0
2019-08-03T07:34:32.9152032Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-03T07:34:32.9155620Z ==============================================================================
2019-08-03T07:34:32.9155689Z Task         : Bash
2019-08-03T07:34:32.9155742Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-03T08:37:48.1816507Z .................................................................................................... 1400/8825
2019-08-03T08:37:54.5378751Z .................................................................................................... 1500/8825
2019-08-03T08:38:07.9600977Z ..................................................................i...............i................. 1600/8825
2019-08-03T08:38:15.9845064Z .................................................................................................... 1700/8825
2019-08-03T08:38:31.4552929Z ....................................................iiiii........................................... 1800/8825
2019-08-03T08:38:43.2889119Z .................................................................................................... 2000/8825
2019-08-03T08:38:45.9439127Z .................................................................................................... 2100/8825
2019-08-03T08:38:49.3886186Z .................................................................................................... 2200/8825
2019-08-03T08:38:59.1442689Z .................................................................................................... 2300/8825
---
2019-08-03T08:42:50.5170838Z .................................................................................................... 5200/8825
2019-08-03T08:42:58.9395343Z ...................................................................i................................ 5300/8825
2019-08-03T08:43:06.2735604Z .................................................................................................... 5400/8825
2019-08-03T08:43:13.4008339Z .................................................................................................... 5500/8825
2019-08-03T08:43:24.7635230Z .............................................................ii...i..ii...........i................. 5600/8825
2019-08-03T08:43:49.5590401Z .................................................................................................... 5800/8825
2019-08-03T08:43:54.6198835Z .................................................................................................... 5900/8825
2019-08-03T08:43:54.6198835Z .................................................................................................... 5900/8825
2019-08-03T08:44:01.5354219Z .............................................................i..ii.................................. 6000/8825
2019-08-03T08:44:30.0678836Z .................................................................................................... 6200/8825
2019-08-03T08:44:32.3685105Z ....i............................................................................................... 6300/8825
2019-08-03T08:44:34.6718495Z ............................................................................i....................... 6400/8825
2019-08-03T08:44:37.4641795Z .................................................................................................... 6500/8825
---
2019-08-03T08:49:27.2720881Z  finished in 22.578
2019-08-03T08:49:27.2919843Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:49:27.4569186Z 
2019-08-03T08:49:27.4569675Z running 146 tests
2019-08-03T08:49:30.7415200Z i....iii......iii..iiii....i............................i..i................i....i.........ii.i.i..i 100/146
2019-08-03T08:49:32.6086662Z iii..............i.........iii.i......ii......
2019-08-03T08:49:32.6087464Z 
2019-08-03T08:49:32.6091292Z  finished in 5.317
2019-08-03T08:49:32.6280512Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:49:32.7902330Z 
---
2019-08-03T08:49:34.8986131Z  finished in 2.270
2019-08-03T08:49:34.9183714Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:49:35.0870670Z 
2019-08-03T08:49:35.0871097Z running 9 tests
2019-08-03T08:49:35.0872302Z iiiiiiiii
2019-08-03T08:49:35.0872752Z 
2019-08-03T08:49:35.0872818Z  finished in 0.168
2019-08-03T08:49:35.1066508Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:49:35.2727525Z 
---
2019-08-03T08:49:53.8207958Z  finished in 18.714
2019-08-03T08:49:53.8418691Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:49:54.0126509Z 
2019-08-03T08:49:54.0127391Z running 122 tests
2019-08-03T08:50:19.3599767Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
2019-08-03T08:50:24.2733870Z .i.i......iii.i.....ii
2019-08-03T08:50:24.2734392Z 
2019-08-03T08:50:24.2737023Z  finished in 30.431
2019-08-03T08:50:24.2746887Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T08:50:24.2747282Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-08-03T09:05:02.0335011Z 
2019-08-03T09:05:02.0336383Z    Doc-tests core
2019-08-03T09:05:06.4048697Z 
2019-08-03T09:05:06.4056655Z running 2379 tests
2019-08-03T09:05:19.7321330Z ......iiiii......................................................................................... 100/2379
2019-08-03T09:05:32.9371736Z .........................................................................ii......................... 200/2379
2019-08-03T09:06:04.4214316Z .................................................................................................... 400/2379
2019-08-03T09:06:04.4214316Z .................................................................................................... 400/2379
2019-08-03T09:06:16.4045191Z ..............................i..i.................iiii............................................. 500/2379
2019-08-03T09:06:41.8846405Z .................................................................................................... 700/2379
2019-08-03T09:06:53.5907950Z .................................................................................................... 800/2379
2019-08-03T09:07:06.0409738Z .................................................................................................... 900/2379
2019-08-03T09:07:19.3959528Z .................................................................................................... 1000/2379
---
2019-08-03T09:12:42.8410477Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:689:13
2019-08-03T09:12:42.8421649Z ....thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
2019-08-03T09:12:42.8421830Z   left: `1`,
2019-08-03T09:12:42.8422190Z  right: `2`', src/libstd/sync/mutex.rs:653:13
2019-08-03T09:12:42.8504029Z ..........thread '<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs:791:13
2019-08-03T09:12:42.8516366Z .thread '<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs..:768:13
2019-08-03T09:12:42.8526821Z ..thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:705:13
2019-08-03T09:12:42.8532290Z ..thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:635:13
2019-08-03T09:12:42.8539889Z .thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:611:13
2019-08-03T09:12:42.8578735Z .......thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:623:13
2019-08-03T09:12:44.8978345Z ......................................thread '<unnamed>' panicked at 'What the answer to my lifetimes dilemma is?', src/libstd/sys_common/remutex.rs:233:13
2019-08-03T09:12:44.9001983Z ............. 700/756
---
2019-08-03T09:12:52.3619474Z 
2019-08-03T09:12:52.3620269Z running 989 tests
2019-08-03T09:13:17.0273866Z i................................................................................................... 100/989
2019-08-03T09:13:30.6127506Z .................................................................................................... 200/989
2019-08-03T09:13:39.7808621Z .................iii......i......i...i......i....................................................... 300/989
2019-08-03T09:13:44.8596782Z .................................................................................................... 400/989
2019-08-03T09:13:53.6888036Z ................................i..i.................................ii............................. 500/989
2019-08-03T09:14:09.5219357Z .................................................................................................... 700/989
2019-08-03T09:14:09.5219357Z .................................................................................................... 700/989
2019-08-03T09:14:18.6087041Z ...............iiii................................................................................. 800/989
2019-08-03T09:14:33.7957894Z .................................................................................................... 900/989
2019-08-03T09:14:41.7685696Z .....................................iiii................................................
2019-08-03T09:14:41.7687764Z 
2019-08-03T09:14:41.7927389Z  finished in 254.321
2019-08-03T09:14:41.7948659Z Testing unwind stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T09:14:42.0067883Z     Finished release [optimized] target(s) in 0.21s
---
2019-08-03T09:17:57.8642002Z 
2019-08-03T09:17:57.8714463Z  finished in 18.725
2019-08-03T09:17:57.8737547Z Testing syntax stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-08-03T09:17:58.0929236Z    Compiling syntax v0.0.0 (/checkout/src/libsyntax)
2019-08-03T09:18:11.2865715Z error: function is never used: `variant_to_string`
2019-08-03T09:18:11.2867085Z    --> src/libsyntax/print/pprust.rs:410:1
2019-08-03T09:18:11.2867712Z     |
2019-08-03T09:18:11.2868741Z 410 | fn variant_to_string(var: &ast::Variant) -> String {
2019-08-03T09:18:11.2870235Z     |
2019-08-03T09:18:11.2870865Z     = note: `-D dead-code` implied by `-D warnings`
2019-08-03T09:18:11.2871145Z 
2019-08-03T09:18:11.6426621Z error: aborting due to previous error
2019-08-03T09:18:11.6426621Z error: aborting due to previous error
2019-08-03T09:18:11.6426735Z 
2019-08-03T09:18:11.7812308Z error: Could not compile `syntax`.
2019-08-03T09:18:11.7812402Z 
2019-08-03T09:18:11.7812664Z To learn more, run the command again with --verbose.
2019-08-03T09:18:11.7836928Z 
2019-08-03T09:18:11.7837014Z 
2019-08-03T09:18:11.7838615Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "syntax" "--" "--quiet"
2019-08-03T09:18:11.7838800Z 
2019-08-03T09:18:11.7838826Z 
2019-08-03T09:18:11.7844302Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-03T09:18:11.7844372Z Build completed unsuccessfully in 1:37:09
2019-08-03T09:18:11.7844372Z Build completed unsuccessfully in 1:37:09
2019-08-03T09:18:12.4271229Z ##[error]Bash exited with code '1'.
2019-08-03T09:18:12.4313277Z ##[section]Starting: Checkout
2019-08-03T09:18:12.4316002Z ==============================================================================
2019-08-03T09:18:12.4316058Z Task         : Get sources
2019-08-03T09:18:12.4316103Z 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
Copy link
Contributor

bors commented Aug 3, 2019

☔ The latest upstream changes (presumably #63234) made this pull request unmergeable. Please resolve the merge conflicts.

src/librustc/hir/mod.rs Outdated Show resolved Hide resolved
src/librustc/hir/mod.rs Outdated Show resolved Hide resolved
src/librustc/hir/mod.rs Outdated Show resolved Hide resolved
@eddyb
Copy link
Member

eddyb commented Aug 9, 2019

cc @rust-lang/compiler I haven't done a full review, but AFAICT the only blocker is that I'm a bit worried about calling value parameters just "params" (i.e. without being more specific).
Maybe runtime_params could work (except for const fn?) - either way, this is basically a bikeshed.

@Centril
Copy link
Contributor

Centril commented Aug 9, 2019

Maybe val_params if you want to be more specific. ;)

@petrochenkov
Copy link
Contributor

Seems ok as is, not worse than just "args" and no need to invent some novel terminology.

@kper
Copy link
Contributor Author

kper commented Aug 9, 2019

@Centril do you mean to rename params to val_params generally? Because I've already troubles to differentiate between args and params. And now, I don't really know how I can see the difference between params and val_params in the code.

@Centril
Copy link
Contributor

Centril commented Aug 9, 2019

@kper I basically agree with @petrochenkov that being more specific is not necessary; it should be clear from context if it is about values or types or whatnot.

@eddyb
Copy link
Member

eddyb commented Aug 9, 2019

@kper No, existing args to val_params. Existing params are almost always going to be generic params.

@Centril I'm worried that the contexts these show up in overlap enough for there to be a serious risk of confusion.

@Centril
Copy link
Contributor

Centril commented Aug 9, 2019

@eddyb Might be worth disambiguating in those specific cases?

@bors
Copy link
Contributor

bors commented Aug 10, 2019

☔ The latest upstream changes (presumably #63437) made this pull request unmergeable. Please resolve the merge conflicts.

})
.collect()
}

// Lowers a function declaration.
//
// `decl`: the unlowered (AST) function declaration.
// `fn_def_id`: if `Some`, impl Trait arguments are lowered into generic parameters on the
// `fn_def_id`: if `Some`, impl Trait parameters are lowered into generic parameters on the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An example where parameters is used twice in the same place to refer to both value parameters and generic parameters.

// only look at the lifetime parameters introduced by the arguments.
let lifetime_count_before_args = self.lifetimes_to_define.len();
// only look at the lifetime parameters introduced by the parameters.
let lifetime_count_before_params = self.lifetimes_to_define.len();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially confusing because of the existence of "lifetime parameters".

@bors
Copy link
Contributor

bors commented Aug 25, 2019

☔ The latest upstream changes (presumably #63878) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis
Copy link
Contributor

@bors delegate=kper

r=me once rebased =)

@kper I've delegated to you, so you should be able to do @bors r=nikomatsakis to get the PR to land.

@bors
Copy link
Contributor

bors commented Aug 26, 2019

✌️ @kper can now approve this pull request

@bors
Copy link
Contributor

bors commented Aug 26, 2019

📌 Commit 3c18dce0414d63d765e23e420afe8b8d5b05eadd has been approved by `nikomatsakis``

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2019
@nikomatsakis
Copy link
Contributor

@bors r-

Sorry, bors, you weren't meant to detect that. This PR won't merge you silly goose.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 26, 2019
@mati865
Copy link
Contributor

mati865 commented Aug 27, 2019

Simple rebase won't help here.
Submodules are totally messed up (commit kper@cf50b5c) and Cargo.lock was returned to the old conflict prone format (commit kper@3c18dce).

Please drop those changes when resolving conflicts.

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (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-08-27T11:49:14.5014276Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-27T11:49:14.5252950Z ##[command]git config gc.auto 0
2019-08-27T11:49:14.5314720Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-27T11:49:15.2014567Z ##[command]git config --get-all http.proxy
2019-08-27T11:49:15.2024873Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-08-27T11:49:50.5565598Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-27T11:49:50.5565775Z 
2019-08-27T11:49:50.5566211Z   git checkout -b <new-branch-name>
2019-08-27T11:49:50.5566259Z 
2019-08-27T11:49:50.5655681Z HEAD is now at ffbc72417 Merge 99950f46b7751ff54b6acdc10ef3195d60bffae6 into 7e0afdad28c4d1154176df6d35a14e738ec311af
2019-08-27T11:49:50.5737079Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-27T11:49:50.5739648Z ==============================================================================
2019-08-27T11:49:50.5739692Z Task         : Bash
2019-08-27T11:49:50.5739725Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-27T11:57:32.4293424Z     Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2019-08-27T11:57:35.1385350Z error[E0412]: cannot find type `Arg` in this scope
2019-08-27T11:57:35.1386589Z    --> src/libsyntax/parse/parser.rs:980:22
2019-08-27T11:57:35.1387308Z     |
2019-08-27T11:57:35.1388220Z 980 |     ) -> PResult<'a, Arg> {
2019-08-27T11:57:35.1388674Z 
2019-08-27T11:57:40.1316345Z error: aborting due to previous error
2019-08-27T11:57:40.1317110Z 
2019-08-27T11:57:40.1317660Z For more information about this error, try `rustc --explain E0412`.
---
2019-08-27T11:57:40.1925110Z == clock drift check ==
2019-08-27T11:57:40.1942287Z   local time: Tue Aug 27 11:57:40 UTC 2019
2019-08-27T11:57:40.3450723Z   network time: Tue, 27 Aug 2019 11:57:40 GMT
2019-08-27T11:57:40.3451632Z == end clock drift check ==
2019-08-27T11:57:41.7188932Z ##[error]Bash exited with code '1'.
2019-08-27T11:57:41.7221955Z ##[section]Starting: Checkout
2019-08-27T11:57:41.7223763Z ==============================================================================
2019-08-27T11:57:41.7223813Z Task         : Get sources
2019-08-27T11:57:41.7223872Z 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)

@kper
Copy link
Contributor Author

kper commented Aug 27, 2019

@mati865 thank you, you're right I totally messed up with those changes.
I rebased, dropped the changes and melted the commits into one. I think it is easier to review it now.

However, something doesn't seem to be right yet. Because when I'm running ./x.py test --stage 0 returns 252 failed tests for me. On the other hand, running the command on master only fails 250 tests.
EDIT: I cloned it again, it seems like the numbers match again.

@mati865
Copy link
Contributor

mati865 commented Aug 27, 2019

@kper if failed tests contain debuginfo in their name then it's "sort of expected" and you can get around it by running x.py with argument --exclude src/test/debuginfo.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (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-08-27T13:50:53.4264158Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-27T13:50:53.4481752Z ##[command]git config gc.auto 0
2019-08-27T13:50:53.4541755Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-27T13:50:53.4593694Z ##[command]git config --get-all http.proxy
2019-08-27T13:50:53.4750309Z ##[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/63127/merge:refs/remotes/pull/63127/merge
---
2019-08-27T13:51:30.3146028Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-27T13:51:30.3146177Z 
2019-08-27T13:51:30.3146498Z   git checkout -b <new-branch-name>
2019-08-27T13:51:30.3146584Z 
2019-08-27T13:51:30.3146639Z HEAD is now at b77de1641 Merge c2fa97eccc37e24eb62c051a3171f7b132dfc9eb into 7e0afdad28c4d1154176df6d35a14e738ec311af
2019-08-27T13:51:30.3309996Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-27T13:51:30.3312976Z ==============================================================================
2019-08-27T13:51:30.3313034Z Task         : Bash
2019-08-27T13:51:30.3313099Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-27T14:52:18.6848748Z .................................................................................................... 1500/8969
2019-08-27T14:52:24.0411741Z .................................................................................................... 1600/8969
2019-08-27T14:52:36.3739820Z .............................................i...............i...................................... 1700/8969
2019-08-27T14:52:44.2217920Z .................................................................................................... 1800/8969
2019-08-27T14:52:57.8693429Z ....................................iiiii........................................................... 1900/8969
2019-08-27T14:53:08.1498281Z .................................................................................................... 2100/8969
2019-08-27T14:53:10.5369617Z .................................................................................................... 2200/8969
2019-08-27T14:53:14.6309006Z .................................................................................................... 2300/8969
2019-08-27T14:53:21.4986905Z .................................................................................................... 2400/8969
---
2019-08-27T14:56:12.1855076Z .......................i...............i............................................................ 4700/8969
2019-08-27T14:56:23.2966696Z .................................................................................................... 4800/8969
2019-08-27T14:56:29.1797646Z .................................................................................................... 4900/8969
2019-08-27T14:56:39.8772142Z .................................................................................................... 5000/8969
2019-08-27T14:56:44.8967440Z ....ii.ii........................................................................................... 5100/8969
2019-08-27T14:56:58.0389014Z .................................................................................................... 5300/8969
2019-08-27T14:57:05.1611395Z ...................................................................i................................ 5400/8969
2019-08-27T14:57:12.2143762Z .................................................................................................... 5500/8969
2019-08-27T14:57:18.9744974Z .................................................................................................... 5600/8969
2019-08-27T14:57:18.9744974Z .................................................................................................... 5600/8969
2019-08-27T14:57:29.1538903Z .............................................................ii...i..ii...........i................. 5700/8969
2019-08-27T14:57:51.2044395Z .................................................................................................... 5900/8969
2019-08-27T14:57:56.0476061Z .................................................................................................... 6000/8969
2019-08-27T14:57:56.0476061Z .................................................................................................... 6000/8969
2019-08-27T14:58:02.6039274Z ..............................................................i..ii................................. 6100/8969
2019-08-27T14:58:29.5758240Z .................................................................................................... 6300/8969
2019-08-27T14:58:31.5039986Z .................i.................................................................................. 6400/8969
2019-08-27T14:58:33.4778999Z .........................................................................................i.......... 6500/8969
2019-08-27T14:58:36.0205290Z .................................................................................................... 6600/8969
---
2019-08-27T15:02:24.7214217Z 
2019-08-27T15:02:24.7215036Z ---- [ui] ui/async-await/no-params-non-move-async-closure.rs stdout ----
2019-08-27T15:02:24.7215291Z diff of stderr:
2019-08-27T15:02:24.7215416Z 
2019-08-27T15:02:24.7215848Z 1 error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-08-27T15:02:24.7216903Z +   --> $DIR/no-params-non-move-async-closure.rs:6:13
2019-08-27T15:02:24.7217118Z 3    |
2019-08-27T15:02:24.7217118Z 3    |
2019-08-27T15:02:24.7217257Z 4 LL |     let _ = async |x: u8| {};
2019-08-27T15:02:24.7217524Z 
2019-08-27T15:02:24.7217640Z 
2019-08-27T15:02:24.7217776Z The actual stderr differed from the expected stderr.
2019-08-27T15:02:24.7218420Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-params-non-move-async-closure/no-params-non-move-async-closure.stderr
2019-08-27T15:02:24.7218420Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-params-non-move-async-closure/no-params-non-move-async-closure.stderr
2019-08-27T15:02:24.7219664Z To update references, rerun the tests and pass the `--bless` flag
2019-08-27T15:02:24.7220348Z To only update this specific test, also pass `--test-args async-await/no-params-non-move-async-closure.rs`
2019-08-27T15:02:24.7220800Z error: 1 errors occurred comparing output.
2019-08-27T15:02:24.7220990Z status: exit code: 1
2019-08-27T15:02:24.7220990Z status: exit code: 1
2019-08-27T15:02:24.7222084Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/no-params-non-move-async-closure.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/async-await/no-params-non-move-async-closure" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/no-params-non-move-async-closure/auxiliary" "-A" "unused"
2019-08-27T15:02:24.7223152Z ------------------------------------------
2019-08-27T15:02:24.7223350Z 
2019-08-27T15:02:24.7223693Z ------------------------------------------
2019-08-27T15:02:24.7223867Z stderr:
2019-08-27T15:02:24.7223867Z stderr:
2019-08-27T15:02:24.7224270Z ------------------------------------------
2019-08-27T15:02:24.7224713Z error[E0708]: `async` non-`move` closures with parameters are not currently supported
2019-08-27T15:02:24.7225141Z   --> /checkout/src/test/ui/async-await/no-params-non-move-async-closure.rs:6:13
2019-08-27T15:02:24.7225337Z    |
2019-08-27T15:02:24.7225476Z LL |     let _ = async |x: u8| {};
2019-08-27T15:02:24.7225765Z    |
2019-08-27T15:02:24.7225765Z    |
2019-08-27T15:02:24.7225937Z    = help: consider using `let` statements to manually capture variables by reference before entering an `async move` closure
2019-08-27T15:02:24.7226212Z error: aborting due to previous error
2019-08-27T15:02:24.7226326Z 
2019-08-27T15:02:24.7226467Z 
2019-08-27T15:02:24.7226819Z ------------------------------------------
---
2019-08-27T15:02:24.7227988Z 1 error[E0628]: generators cannot have explicit parameters
2019-08-27T15:02:24.7228347Z -   --> $DIR/no-arguments-on-generators.rs:4:15
2019-08-27T15:02:24.7228764Z +   --> $DIR/no-parameters-on-generators.rs:4:15
2019-08-27T15:02:24.7228948Z 3    |
2019-08-27T15:02:24.7229086Z 4 LL |     let gen = |start| {
2019-08-27T15:02:24.7229990Z 
2019-08-27T15:02:24.7230166Z 
2019-08-27T15:02:24.7230340Z The actual stderr differed from the expected stderr.
2019-08-27T15:02:24.7230948Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-parameters-on-generators/no-parameters-on-generators.stderr
2019-08-27T15:02:24.7230948Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generator/no-parameters-on-generators/no-parameters-on-generators.stderr
2019-08-27T15:02:24.7231467Z To update references, rerun the tests and pass the `--bless` flag
2019-08-27T15:02:24.7232048Z To only update this specific test, also pass `--test-args generator/no-parameters-on-generators.rs`
2019-08-27T15:02:24.7232447Z error: 1 errors occurred comparing output.
2019-08-27T15:02:24.7232903Z status: exit code: 1
2019-08-27T15:02:24.7232903Z status: exit code: 1
2019-08-27T15:02:24.7234013Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/generator/no-parameters-on-generators.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/generator/no-parameters-on-generators" "-Crpath" "-O" "-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/generator/no-parameters-on-generators/auxiliary" "-A" "unused"
2019-08-27T15:02:24.7234614Z ------------------------------------------
2019-08-27T15:02:24.7234774Z 
2019-08-27T15:02:24.7235113Z ------------------------------------------
2019-08-27T15:02:24.7235334Z stderr:
2019-08-27T15:02:24.7235334Z stderr:
2019-08-27T15:02:24.7235676Z ------------------------------------------
2019-08-27T15:02:24.7235877Z error[E0628]: generators cannot have explicit parameters
2019-08-27T15:02:24.7236247Z   --> /checkout/src/test/ui/generator/no-parameters-on-generators.rs:4:15
2019-08-27T15:02:24.7236428Z    |
2019-08-27T15:02:24.7236604Z LL |     let gen = |start| { //~ ERROR generators cannot have explicit parameters
2019-08-27T15:02:24.7236862Z 
2019-08-27T15:02:24.7237047Z error: aborting due to previous error
2019-08-27T15:02:24.7237166Z 
2019-08-27T15:02:24.7237284Z 
---
2019-08-27T15:02:24.7245336Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-08-27T15:02:24.7245649Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-08-27T15:02:24.7258646Z 
2019-08-27T15:02:24.7258894Z 
2019-08-27T15:02:24.7261084Z 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" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-08-27T15:02:24.7261669Z 
2019-08-27T15:02:24.7261865Z 
2019-08-27T15:02:24.7304776Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-27T15:02:24.7305136Z Build completed unsuccessfully in 1:04:28
2019-08-27T15:02:24.7305136Z Build completed unsuccessfully in 1:04:28
2019-08-27T15:02:24.7318592Z == clock drift check ==
2019-08-27T15:02:24.7331097Z   local time: Tue Aug 27 15:02:24 UTC 2019
2019-08-27T15:02:25.0161044Z   network time: Tue, 27 Aug 2019 15:02:25 GMT
2019-08-27T15:02:25.0164595Z == end clock drift check ==
2019-08-27T15:02:25.8850054Z ##[error]Bash exited with code '1'.
2019-08-27T15:02:25.8891863Z ##[section]Starting: Checkout
2019-08-27T15:02:25.8893970Z ==============================================================================
2019-08-27T15:02:25.8894019Z Task         : Get sources
2019-08-27T15:02:25.8894075Z 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)

`async-await/no-args-non-move-async-closure`
`generator/no-arguments-on-generators`
@kper
Copy link
Contributor Author

kper commented Aug 27, 2019

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Aug 27, 2019

📌 Commit 97319b2 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 27, 2019
@bors
Copy link
Contributor

bors commented Aug 28, 2019

⌛ Testing commit 97319b2 with merge bbd48e6...

bors added a commit that referenced this pull request Aug 28, 2019
Cleanup: Consistently use `Param` instead of `Arg` #62426

Fixes #62426
@bors
Copy link
Contributor

bors commented Aug 28, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing bbd48e6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 28, 2019
@bors bors merged commit 97319b2 into rust-lang:master Aug 28, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63127!

Tested on commit bbd48e6.
Direct link to PR: #63127

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 28, 2019
Tested on commit rust-lang/rust@bbd48e6.
Direct link to PR: <rust-lang/rust#63127>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
bors added a commit to rust-lang/rust-clippy that referenced this pull request Aug 28, 2019
Replace `Arg` with `Param`

Fix build issue.
Rustup to rust-lang/rust#63127

changelog: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cleanup: Consistently use Param instead of Arg