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

handle elision in async fn correctly #63499

Merged

Conversation

@nikomatsakis
Copy link
Contributor

commented Aug 12, 2019

We now always make fresh lifetimne parameters for all elided
lifetimes, whether they are in the inputs or outputs. But then
we generate '_ in the case of elided lifetimes from the outputs.

Example:

async fn foo<'a>(x: &'a u32) -> &u32 { .. }

becomes

type Foo<'a, 'b> = impl Future<Output = &'b u32>;
fn foo<'a>(x: &'a u32) -> Foo<'a, '_>

Fixes #63388

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issuee-63388-async-fn-elision-self-mut-self branch from 19c04a7 to 9ed22c8 Aug 12, 2019

f
}

// Test using `&Self` explicitly:
//
// FIXME(#63388). This behavior *ought* to, but does not,

This comment has been minimized.

Copy link
@cramertj

cramertj Aug 12, 2019

Member

ick, that's pretty gnarly, though I suppose backwards-compatible (since we just disallow it, rather than misinterpreting it)

This comment has been minimized.

Copy link
@nikomatsakis

nikomatsakis Aug 12, 2019

Author Contributor

Yeah...roughly what I was thinking. Not entirely sure this PR is the right thing to do. I'm just assuming that a more correct fix will take more time -- but I think we should definitely not just leave the code like this long term.

// lifetime from `&self` (same for `&mut self`). This
// will always be the first one we define.
hir::ImplicitSelfKind::ImmRef | hir::ImplicitSelfKind::MutRef =>
get_elided_lt_replacement(

This comment has been minimized.

Copy link
@cramertj

cramertj Aug 12, 2019

Member

IMO this call is somewhat cleaner when inlined:

let (_span, param) = self.lifetimes_to_define[lifetime_count_before_args];
LtReplacement::Some(param)
@cramertj

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

r=me. This is... not wonderful, but it seems like a clear and simple fix for the most common case.

@nikomatsakis

This comment has been minimized.

Copy link
Contributor Author

commented Aug 12, 2019

I'm seeing some test failures that suggest that my assumption that &self implies at least one lifetime is wrong =)

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 12, 2019

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-12T18:47:36.0123742Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-12T18:47:36.0312652Z ##[command]git config gc.auto 0
2019-08-12T18:47:36.0390109Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-12T18:47:36.0453496Z ##[command]git config --get-all http.proxy
2019-08-12T18:47:36.0595858Z ##[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/63499/merge:refs/remotes/pull/63499/merge
---
2019-08-12T18:48:10.9257196Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-12T18:48:10.9257232Z 
2019-08-12T18:48:10.9257486Z   git checkout -b <new-branch-name>
2019-08-12T18:48:10.9257518Z 
2019-08-12T18:48:10.9257581Z HEAD is now at 31ea08eda Merge 9ed22c8c9ca5462753b6d10bc23ba167dd9c9c36 into 60960a260f7b5c695fd0717311d72ce62dd4eb43
2019-08-12T18:48:10.9439049Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-12T18:48:10.9442694Z ==============================================================================
2019-08-12T18:48:10.9442779Z Task         : Bash
2019-08-12T18:48:10.9442831Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-12T19:52:15.9293439Z .................................................................................................... 1300/8896
2019-08-12T19:52:22.5702012Z .................................................................................................... 1400/8896
2019-08-12T19:52:29.0112914Z .................................................................................................... 1500/8896
2019-08-12T19:52:40.0162279Z ....................................................................................i............... 1600/8896
2019-08-12T19:52:47.9000142Z i................................................................................................... 1700/8896
2019-08-12T19:52:54.9162089Z ...........................................................................iiiii.................... 1800/8896
2019-08-12T19:53:17.8113933Z .................................................................................................... 2000/8896
2019-08-12T19:53:20.3627124Z .................................................................................................... 2100/8896
2019-08-12T19:53:23.1729872Z .................................................................................................... 2200/8896
2019-08-12T19:53:31.2246534Z .................................................................................................... 2300/8896
---
2019-08-12T19:57:33.9581042Z .................................................................................................... 5300/8896
2019-08-12T19:57:41.4455863Z ........i........................................................................................... 5400/8896
2019-08-12T19:57:47.1605206Z .................................................................................................... 5500/8896
2019-08-12T19:57:59.7967277Z .................................................................................................... 5600/8896
2019-08-12T19:58:14.4249188Z ...ii...i..ii...........i........................................................................... 5700/8896
2019-08-12T19:58:31.8448031Z .................................................................................................... 5900/8896
2019-08-12T19:58:36.7280495Z .................................................................................................... 6000/8896
2019-08-12T19:58:36.7280495Z .................................................................................................... 6000/8896
2019-08-12T19:58:51.3152013Z ....i..ii........................................................................................... 6100/8896
2019-08-12T19:59:10.7997563Z ...............................................i.................................................... 6300/8896
2019-08-12T19:59:13.0384557Z .................................................................................................... 6400/8896
2019-08-12T19:59:15.5817968Z ...................i................................................................................ 6500/8896
2019-08-12T19:59:20.2534398Z .................................................................................................... 6600/8896
---
2019-08-12T20:03:28.2488915Z failures:
2019-08-12T20:03:28.2532270Z 
2019-08-12T20:03:28.2533349Z ---- [ui] ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs stdout ----
2019-08-12T20:03:28.2533491Z 
2019-08-12T20:03:28.2533806Z error: test compilation failed although it shouldn't!
2019-08-12T20:03:28.2533865Z status: exit code: 101
2019-08-12T20:03:28.2535093Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters-by-ref-binding/a" "-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/drop-order/drop-order-for-async-fn-parameters-by-ref-binding/auxiliary" "-A" "unused"
2019-08-12T20:03:28.2535565Z ------------------------------------------
2019-08-12T20:03:28.2535607Z 
2019-08-12T20:03:28.2535850Z ------------------------------------------
2019-08-12T20:03:28.2535916Z stderr:
2019-08-12T20:03:28.2535916Z stderr:
2019-08-12T20:03:28.2536153Z ------------------------------------------
2019-08-12T20:03:28.2536475Z thread 'rustc' panicked at 'index 1 out of range for slice of length 0', src/libcore/slice/mod.rs:2583:5
2019-08-12T20:03:28.2536749Z 
2019-08-12T20:03:28.2536799Z error: internal compiler error: unexpected panic
2019-08-12T20:03:28.2536831Z 
2019-08-12T20:03:28.2536897Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2536897Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2536931Z 
2019-08-12T20:03:28.2537421Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2019-08-12T20:03:28.2537762Z note: rustc 1.38.0-dev running on x86_64-unknown-linux-gnu
2019-08-12T20:03:28.2537798Z 
2019-08-12T20:03:28.2537798Z 
2019-08-12T20:03:28.2538104Z note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
2019-08-12T20:03:28.2538191Z 
2019-08-12T20:03:28.2538427Z ------------------------------------------
2019-08-12T20:03:28.2538471Z 
2019-08-12T20:03:28.2538499Z 
2019-08-12T20:03:28.2538499Z 
2019-08-12T20:03:28.2538801Z ---- [ui] ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs stdout ----
2019-08-12T20:03:28.2538903Z 
2019-08-12T20:03:28.2539148Z error: test compilation failed although it shouldn't!
2019-08-12T20:03:28.2539210Z status: exit code: 101
2019-08-12T20:03:28.2540151Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/drop-order/drop-order-for-async-fn-parameters/a" "-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/drop-order/drop-order-for-async-fn-parameters/auxiliary" "-A" "unused"
2019-08-12T20:03:28.2540520Z ------------------------------------------
2019-08-12T20:03:28.2540557Z 
2019-08-12T20:03:28.2540810Z ------------------------------------------
2019-08-12T20:03:28.2540871Z stderr:
2019-08-12T20:03:28.2540871Z stderr:
2019-08-12T20:03:28.2541109Z ------------------------------------------
2019-08-12T20:03:28.2541419Z thread 'rustc' panicked at 'index 1 out of range for slice of length 0', src/libcore/slice/mod.rs:2583:5
2019-08-12T20:03:28.2541543Z 
2019-08-12T20:03:28.2541591Z error: internal compiler error: unexpected panic
2019-08-12T20:03:28.2541640Z 
2019-08-12T20:03:28.2541690Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2541690Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2541723Z 
2019-08-12T20:03:28.2542359Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2019-08-12T20:03:28.2542890Z note: rustc 1.38.0-dev running on x86_64-unknown-linux-gnu
2019-08-12T20:03:28.2542938Z 
2019-08-12T20:03:28.2542938Z 
2019-08-12T20:03:28.2543306Z note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
2019-08-12T20:03:28.2543390Z 
2019-08-12T20:03:28.2543631Z ------------------------------------------
2019-08-12T20:03:28.2543665Z 
2019-08-12T20:03:28.2543708Z 
2019-08-12T20:03:28.2543708Z 
2019-08-12T20:03:28.2543983Z ---- [ui] ui/async-await/drop-order/drop-order-when-cancelled.rs stdout ----
2019-08-12T20:03:28.2544022Z 
2019-08-12T20:03:28.2544266Z error: test compilation failed although it shouldn't!
2019-08-12T20:03:28.2544338Z status: exit code: 101
2019-08-12T20:03:28.2545237Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/drop-order/drop-order-when-cancelled.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/drop-order/drop-order-when-cancelled/a" "-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/drop-order/drop-order-when-cancelled/auxiliary" "-A" "unused"
2019-08-12T20:03:28.2545809Z ------------------------------------------
2019-08-12T20:03:28.2545846Z 
2019-08-12T20:03:28.2546103Z ------------------------------------------
2019-08-12T20:03:28.2546153Z stderr:
2019-08-12T20:03:28.2546153Z stderr:
2019-08-12T20:03:28.2546385Z ------------------------------------------
2019-08-12T20:03:28.2546714Z thread 'rustc' panicked at 'index 1 out of range for slice of length 0', src/libcore/slice/mod.rs:2583:5
2019-08-12T20:03:28.2546871Z 
2019-08-12T20:03:28.2546934Z error: internal compiler error: unexpected panic
2019-08-12T20:03:28.2546977Z 
2019-08-12T20:03:28.2547027Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2547027Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2547060Z 
2019-08-12T20:03:28.2547435Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2019-08-12T20:03:28.2547757Z note: rustc 1.38.0-dev running on x86_64-unknown-linux-gnu
2019-08-12T20:03:28.2547809Z 
2019-08-12T20:03:28.2547809Z 
2019-08-12T20:03:28.2548118Z note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
2019-08-12T20:03:28.2548187Z 
2019-08-12T20:03:28.2548435Z ------------------------------------------
2019-08-12T20:03:28.2548470Z 
2019-08-12T20:03:28.2548497Z 
2019-08-12T20:03:28.2548497Z 
2019-08-12T20:03:28.2549319Z ---- [ui] ui/async-await/issues/issue-58885.rs stdout ----
2019-08-12T20:03:28.2549364Z 
2019-08-12T20:03:28.2549673Z error: test compilation failed although it shouldn't!
2019-08-12T20:03:28.2549727Z status: exit code: 101
2019-08-12T20:03:28.2550584Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/async-await/issues/issue-58885.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/issues/issue-58885" "-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/issues/issue-58885/auxiliary" "-A" "unused"
2019-08-12T20:03:28.2550957Z ------------------------------------------
2019-08-12T20:03:28.2551009Z 
2019-08-12T20:03:28.2551251Z ------------------------------------------
2019-08-12T20:03:28.2551300Z stderr:
2019-08-12T20:03:28.2551300Z stderr:
2019-08-12T20:03:28.2551552Z ------------------------------------------
2019-08-12T20:03:28.2552120Z thread 'rustc' panicked at 'index 1 out of range for slice of length 0', src/libcore/slice/mod.rs:2583:5
2019-08-12T20:03:28.2552260Z 
2019-08-12T20:03:28.2552308Z error: internal compiler error: unexpected panic
2019-08-12T20:03:28.2552784Z 
2019-08-12T20:03:28.2552843Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2552843Z note: the compiler unexpectedly panicked. this is a bug.
2019-08-12T20:03:28.2552892Z 
2019-08-12T20:03:28.2553347Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2019-08-12T20:03:28.2553678Z note: rustc 1.38.0-dev running on x86_64-unknown-linux-gnu
2019-08-12T20:03:28.2553715Z 
2019-08-12T20:03:28.2553715Z 
2019-08-12T20:03:28.2554023Z note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
2019-08-12T20:03:28.2554109Z 
2019-08-12T20:03:28.2554346Z ------------------------------------------
2019-08-12T20:03:28.2554379Z 
2019-08-12T20:03:28.2554407Z 
---
2019-08-12T20:03:28.2578819Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-08-12T20:03:28.2578910Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-08-12T20:03:28.2595314Z 
2019-08-12T20:03:28.2596229Z 
2019-08-12T20:03:28.2600433Z 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-12T20:03:28.2601249Z 
2019-08-12T20:03:28.2601421Z 
2019-08-12T20:03:28.2608320Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-12T20:03:28.2608517Z Build completed unsuccessfully in 1:08:43
2019-08-12T20:03:28.2608517Z Build completed unsuccessfully in 1:08:43
2019-08-12T20:03:28.9987926Z ##[error]Bash exited with code '1'.
2019-08-12T20:03:29.0061851Z ##[section]Starting: Checkout
2019-08-12T20:03:29.0064703Z ==============================================================================
2019-08-12T20:03:29.0064783Z Task         : Get sources
2019-08-12T20:03:29.0064837Z 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)

@Centril

This comment was marked as resolved.

Copy link
Member

commented Aug 12, 2019

Could you please also include the test in #63388:

// check-pass

struct A;

impl A {
    async fn foo(&self, f: &u32) -> &A { self }
}

so we have some positive evidence that it works (and not just by "well the negative case errors in the way we expect")?

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issuee-63388-async-fn-elision-self-mut-self branch 2 times, most recently from bfc95ee to b4bc0f4 Aug 12, 2019

@nikomatsakis

This comment has been minimized.

Copy link
Contributor Author

commented Aug 12, 2019

@cramertj this is ready for re-review

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issuee-63388-async-fn-elision-self-mut-self branch from b4bc0f4 to 233daaa Aug 12, 2019

revamp how we handle elision in async fn
We now always make fresh lifetimne parameters for all elided
lifetimes, whether they are in the inputs or outputs. But then
we generate `'_` in the case of elided lifetimes from the outputs.

Example:

```rust
async fn foo<'a>(x: &'a u32) -> &u32 { .. }
```

becomes

```rust
type Foo<'a, 'b> = impl Future<Output = &'b u32>;
fn foo<'a>(x: &'a u32) -> Foo<'a, '_>
```

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:issuee-63388-async-fn-elision-self-mut-self branch from 233daaa to 03e7b96 Aug 12, 2019

@nikomatsakis nikomatsakis changed the title Issuee 63388 async fn elision self mut self handle elision in async fn correctly Aug 12, 2019

@Centril Centril referenced this pull request Aug 12, 2019

Open

Stabilize `async_await` in Rust 1.39.0 #63209

8 of 9 tasks complete
@@ -2622,9 +2570,18 @@ impl<'a> LoweringContext<'a> {

self.allocate_hir_id_counter(opaque_ty_node_id);

let input_lifetimes_count = self.in_scope_lifetimes.len() + self.lifetimes_to_define.len();

This comment has been minimized.

Copy link
@cramertj

cramertj Aug 12, 2019

Member

This is pretty clever and probably deserves a comment-- that in_scope_lifetimes contains all the non-elided lifetime names in scope, and lifetimes_to_define says how many lifetimes we have been paired with CreateParameter, so the last lifetime_params.len() - (in_scope_lifetimes + lifetimes_to_define) elements of lifetime_params are all elided lifetimes. Obviously the way I just worded it is probably even more confusing than just reading the code, but I think some explanation would be helpful.

@cramertj

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

r=me with comment-- this seems better than the Replace hack that I introduced and is certainly more correct. I personally found it a bit more confusing to understand, but I think with a comment it's not too bad.

nikomatsakis added some commits Aug 12, 2019

@nikomatsakis

This comment has been minimized.

Copy link
Contributor Author

commented Aug 12, 2019

@cramertj is that comment roughly what you had in mind?

@cramertj

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

Looks great, thanks!

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

📌 Commit ad214fe has been approved by cramertj

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 13, 2019

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-12T23:24:07.4754209Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-12T23:24:07.4916516Z ##[command]git config gc.auto 0
2019-08-12T23:24:07.4987283Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-12T23:24:07.5038700Z ##[command]git config --get-all http.proxy
2019-08-12T23:24:07.5159964Z ##[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/63499/merge:refs/remotes/pull/63499/merge
---
2019-08-12T23:24:41.7970841Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-12T23:24:41.7970874Z 
2019-08-12T23:24:41.7971121Z   git checkout -b <new-branch-name>
2019-08-12T23:24:41.7971167Z 
2019-08-12T23:24:41.7971215Z HEAD is now at 0192f0517 Merge ad214fe47092c5b3d36a58480f6fa3f62d20770b into 60960a260f7b5c695fd0717311d72ce62dd4eb43
2019-08-12T23:24:41.8115487Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-12T23:24:41.8117685Z ==============================================================================
2019-08-12T23:24:41.8117729Z Task         : Bash
2019-08-12T23:24:41.8117764Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-13T00:21:11.1989789Z .................................................................................................... 1400/8900
2019-08-13T00:21:17.1140899Z .................................................................................................... 1500/8900
2019-08-13T00:21:26.8188019Z ........................................................................................i........... 1600/8900
2019-08-13T00:21:33.3616892Z ....i............................................................................................... 1700/8900
2019-08-13T00:21:39.8599818Z ...............................................................................iiiii................ 1800/8900
2019-08-13T00:21:59.6713032Z .................................................................................................... 2000/8900
2019-08-13T00:22:01.7949069Z .................................................................................................... 2100/8900
2019-08-13T00:22:04.1353539Z .................................................................................................... 2200/8900
2019-08-13T00:22:11.0471006Z .................................................................................................... 2300/8900
---
2019-08-13T00:25:43.9624483Z .................................................................................................... 5300/8900
2019-08-13T00:25:50.7418070Z ............i....................................................................................... 5400/8900
2019-08-13T00:25:55.6712408Z .................................................................................................... 5500/8900
2019-08-13T00:26:07.0585175Z .................................................................................................... 5600/8900
2019-08-13T00:26:19.6871837Z .......ii...i..ii...........i....................................................................... 5700/8900
2019-08-13T00:26:34.8712391Z .................................................................................................... 5900/8900
2019-08-13T00:26:39.1333147Z .................................................................................................... 6000/8900
2019-08-13T00:26:39.1333147Z .................................................................................................... 6000/8900
2019-08-13T00:26:51.7763323Z ........i..ii....................................................................................... 6100/8900
2019-08-13T00:27:09.0027991Z ...................................................i................................................ 6300/8900
2019-08-13T00:27:10.8326543Z .................................................................................................... 6400/8900
2019-08-13T00:27:12.9411948Z .......................i............................................................................ 6500/8900
2019-08-13T00:27:16.9572132Z .................................................................................................... 6600/8900
---
2019-08-13T00:30:52.8129451Z - error[E0106]: missing lifetime specifier
2019-08-13T00:30:52.8129882Z + error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8130211Z 2   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:10:45
2019-08-13T00:30:52.8130262Z 3    |
2019-08-13T00:30:52.8130513Z 4 LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
2019-08-13T00:30:52.8130767Z -    |                                             ^
2019-08-13T00:30:52.8130946Z -    |
2019-08-13T00:30:52.8130946Z -    |
2019-08-13T00:30:52.8131242Z -    = note: return-position elided lifetimes require exactly one input-position elided lifetime, found multiple.
2019-08-13T00:30:52.8131475Z +    |                          ----               ^^^^
2019-08-13T00:30:52.8131547Z +    |                          |                  |
2019-08-13T00:30:52.8131601Z +    |                          |                  ...but data from `f` is returned here
2019-08-13T00:30:52.8131660Z +    |                          this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8131969Z - error[E0106]: missing lifetime specifier
2019-08-13T00:30:52.8132210Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:60
2019-08-13T00:30:52.8132261Z + error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8132518Z +   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:55
2019-08-13T00:30:52.8132518Z +   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:55
2019-08-13T00:30:52.8132565Z 11    |
2019-08-13T00:30:52.8132819Z 12 LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8133396Z -    |
2019-08-13T00:30:52.8133396Z -    |
2019-08-13T00:30:52.8133606Z -    = note: return-position elided lifetimes require exactly one input-position elided lifetime, found multiple.
2019-08-13T00:30:52.8133816Z +    |                          -----                        ^^^^^^^^^^^^^^^^^
2019-08-13T00:30:52.8134028Z +    |                          |                            |
2019-08-13T00:30:52.8134078Z +    |                          |                            ...but data from `f` is returned here
2019-08-13T00:30:52.8134143Z +    |                          this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8134382Z - error[E0106]: missing lifetime specifier
2019-08-13T00:30:52.8134586Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:67
2019-08-13T00:30:52.8134724Z -    |
2019-08-13T00:30:52.8134724Z -    |
2019-08-13T00:30:52.8134918Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8135265Z -    |
2019-08-13T00:30:52.8135265Z -    |
2019-08-13T00:30:52.8135475Z -    = note: return-position elided lifetimes require exactly one input-position elided lifetime, found multiple.
2019-08-13T00:30:52.8135806Z - error: cannot infer an appropriate lifetime
2019-08-13T00:30:52.8136168Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:10:33
2019-08-13T00:30:52.8136316Z -    |
2019-08-13T00:30:52.8136316Z -    |
2019-08-13T00:30:52.8136482Z - LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
2019-08-13T00:30:52.8136683Z -    |                                 ^           ---- this return type evaluates to the `'static` lifetime...
2019-08-13T00:30:52.8137025Z -    |                                 ...but this borrow...
2019-08-13T00:30:52.8137155Z -    |
2019-08-13T00:30:52.8137155Z -    |
2019-08-13T00:30:52.8137332Z - note: ...can't outlive the lifetime '_ as defined on the method body at 10:26
2019-08-13T00:30:52.8137525Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:10:26
2019-08-13T00:30:52.8137656Z -    |
2019-08-13T00:30:52.8137819Z - LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
2019-08-13T00:30:52.8137985Z -    |                          ^
2019-08-13T00:30:52.8138289Z - help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime '_ as defined on the method body at 10:26
2019-08-13T00:30:52.8138451Z -    |
2019-08-13T00:30:52.8138650Z - LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo + '_ { f }
2019-08-13T00:30:52.8138943Z - 
2019-08-13T00:30:52.8139113Z - error: cannot infer an appropriate lifetime
2019-08-13T00:30:52.8140151Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:16
2019-08-13T00:30:52.8140344Z -    |
2019-08-13T00:30:52.8140344Z -    |
2019-08-13T00:30:52.8140622Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8141168Z -    |                ^^^^ ...but this borrow...             ----------------- this return type evaluates to the `'static` lifetime...
2019-08-13T00:30:52.8141359Z -    |
2019-08-13T00:30:52.8141624Z - note: ...can't outlive the lifetime '_ as defined on the method body at 15:26
2019-08-13T00:30:52.8141887Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:26
2019-08-13T00:30:52.8142063Z -    |
2019-08-13T00:30:52.8142334Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8142541Z -    |                          ^
2019-08-13T00:30:52.8142857Z - help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime '_ as defined on the method body at 15:26
2019-08-13T00:30:52.8143212Z -    |
2019-08-13T00:30:52.8143768Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) + '_ { (self, f) }
2019-08-13T00:30:52.8144094Z - 
2019-08-13T00:30:52.8144248Z - error: cannot infer an appropriate lifetime
2019-08-13T00:30:52.8144610Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:34
2019-08-13T00:30:52.8144889Z -    |
2019-08-13T00:30:52.8144889Z -    |
2019-08-13T00:30:52.8145272Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8145513Z -    |                                  ^                    ----------------- this return type evaluates to the `'static` lifetime...
2019-08-13T00:30:52.8145888Z -    |                                  ...but this borrow...
2019-08-13T00:30:52.8146028Z -    |
2019-08-13T00:30:52.8146028Z -    |
2019-08-13T00:30:52.8146222Z - note: ...can't outlive the lifetime '_ as defined on the method body at 15:26
2019-08-13T00:30:52.8146433Z -   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:26
2019-08-13T00:30:52.8146574Z -    |
2019-08-13T00:30:52.8146773Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8146953Z -    |                          ^
2019-08-13T00:30:52.8147211Z - help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime '_ as defined on the method body at 15:26
2019-08-13T00:30:52.8147366Z -    |
2019-08-13T00:30:52.8147589Z - LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) + '_ { (self, f) }
2019-08-13T00:30:52.8148126Z - 
2019-08-13T00:30:52.8148177Z 77 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8148530Z 78   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:25:58
2019-08-13T00:30:52.8148564Z 79    |
2019-08-13T00:30:52.8148564Z 79    |
2019-08-13T00:30:52.8148600Z 
2019-08-13T00:30:52.8148638Z 83    |                                  |                       ...but data from `arg` is returned here
2019-08-13T00:30:52.8148681Z 84    |                                  this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8148897Z - error: aborting due to 7 previous errors
2019-08-13T00:30:52.8148933Z + error: aborting due to 3 previous errors
2019-08-13T00:30:52.8149026Z 87 
2019-08-13T00:30:52.8149237Z - For more information about this error, try `rustc --explain E0106`.
2019-08-13T00:30:52.8149237Z - For more information about this error, try `rustc --explain E0106`.
2019-08-13T00:30:52.8149272Z 89 
2019-08-13T00:30:52.8149292Z 
2019-08-13T00:30:52.8149311Z 
2019-08-13T00:30:52.8149364Z The actual stderr differed from the expected stderr.
2019-08-13T00:30:52.8150066Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
2019-08-13T00:30:52.8150321Z To update references, rerun the tests and pass the `--bless` flag
2019-08-13T00:30:52.8150622Z To only update this specific test, also pass `--test-args self/arbitrary_self_types_pin_lifetime_mismatch-async.rs`
2019-08-13T00:30:52.8150703Z error: 1 errors occurred comparing output.
2019-08-13T00:30:52.8150768Z status: exit code: 1
2019-08-13T00:30:52.8150768Z status: exit code: 1
2019-08-13T00:30:52.8151612Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.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/self/arbitrary_self_types_pin_lifetime_mismatch-async" "-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/self/arbitrary_self_types_pin_lifetime_mismatch-async/auxiliary" "-A" "unused"
2019-08-13T00:30:52.8151943Z ------------------------------------------
2019-08-13T00:30:52.8151976Z 
2019-08-13T00:30:52.8152204Z ------------------------------------------
2019-08-13T00:30:52.8152249Z stderr:
2019-08-13T00:30:52.8152249Z stderr:
2019-08-13T00:30:52.8152455Z ------------------------------------------
2019-08-13T00:30:52.8152622Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8152909Z   --> /checkout/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs:10:45
2019-08-13T00:30:52.8152963Z    |
2019-08-13T00:30:52.8153530Z LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
2019-08-13T00:30:52.8153868Z    |                          ----               ^^^^
2019-08-13T00:30:52.8153907Z    |                          |                  |
2019-08-13T00:30:52.8153949Z    |                          |                  ...but data from `f` is returned here
2019-08-13T00:30:52.8154011Z    |                          this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8154073Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8154296Z   --> /checkout/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs:15:55
2019-08-13T00:30:52.8154335Z    |
2019-08-13T00:30:52.8154335Z    |
2019-08-13T00:30:52.8154533Z LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
2019-08-13T00:30:52.8154760Z    |                          -----                        ^^^^^^^^^^^^^^^^^
2019-08-13T00:30:52.8154803Z    |                          |                            |
2019-08-13T00:30:52.8154845Z    |                          |                            ...but data from `f` is returned here
2019-08-13T00:30:52.8154909Z    |                          this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8155143Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8155517Z   --> /checkout/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs:25:58
2019-08-13T00:30:52.8155748Z    |
2019-08-13T00:30:52.8155748Z    |
2019-08-13T00:30:52.8155945Z LL |     async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg } //~ ERROR E0623
2019-08-13T00:30:52.8156127Z    |                                  -----                   ^^^
2019-08-13T00:30:52.8156184Z    |                                  |                       |
2019-08-13T00:30:52.8156292Z    |                                  |                       ...but data from `arg` is returned here
2019-08-13T00:30:52.8156343Z    |                                  this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8156420Z error: aborting due to 3 previous errors
2019-08-13T00:30:52.8156442Z 
2019-08-13T00:30:52.8156461Z 
2019-08-13T00:30:52.8156657Z ------------------------------------------
---
2019-08-13T00:30:52.8157073Z 10 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8157244Z -   --> $DIR/ref-mut-self-async.rs:24:52
2019-08-13T00:30:52.8157412Z +   --> $DIR/ref-mut-self-async.rs:21:52
2019-08-13T00:30:52.8157464Z 12    |
2019-08-13T00:30:52.8157645Z 13 LL |     async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
2019-08-13T00:30:52.8157824Z 14    |                             ---------              ^^^^
2019-08-13T00:30:52.8157907Z 17    |                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8157944Z 18 
2019-08-13T00:30:52.8157978Z 19 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8158391Z -   --> $DIR/ref-mut-self-async.rs:28:61
2019-08-13T00:30:52.8158391Z -   --> $DIR/ref-mut-self-async.rs:28:61
2019-08-13T00:30:52.8158581Z +   --> $DIR/ref-mut-self-async.rs:25:61
2019-08-13T00:30:52.8158615Z 21    |
2019-08-13T00:30:52.8158996Z 22 LL |     async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8159175Z 23    |                                     ---------               ^^^^
2019-08-13T00:30:52.8159327Z 26    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8159382Z 27 
2019-08-13T00:30:52.8159416Z 28 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8159594Z -   --> $DIR/ref-mut-self-async.rs:32:61
2019-08-13T00:30:52.8159594Z -   --> $DIR/ref-mut-self-async.rs:32:61
2019-08-13T00:30:52.8160168Z +   --> $DIR/ref-mut-self-async.rs:29:61
2019-08-13T00:30:52.8160220Z 30    |
2019-08-13T00:30:52.8160465Z 31 LL |     async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8160728Z 32    |                                     ---------               ^^^^
2019-08-13T00:30:52.8160817Z 35    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8160883Z 36 
2019-08-13T00:30:52.8160927Z 37 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8161137Z -   --> $DIR/ref-mut-self-async.rs:36:70
2019-08-13T00:30:52.8161137Z -   --> $DIR/ref-mut-self-async.rs:36:70
2019-08-13T00:30:52.8161363Z +   --> $DIR/ref-mut-self-async.rs:33:70
2019-08-13T00:30:52.8161420Z 39    |
2019-08-13T00:30:52.8161680Z 40 LL |     async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8161933Z 41    |                                             ---------                ^^^^
2019-08-13T00:30:52.8162039Z 44    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8162089Z 45 
2019-08-13T00:30:52.8162155Z 46 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8162365Z -   --> $DIR/ref-mut-self-async.rs:40:70
2019-08-13T00:30:52.8162365Z -   --> $DIR/ref-mut-self-async.rs:40:70
2019-08-13T00:30:52.8162574Z +   --> $DIR/ref-mut-self-async.rs:37:70
2019-08-13T00:30:52.8162635Z 48    |
2019-08-13T00:30:52.8162884Z 49 LL |     async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8163133Z 50    |                                             ---------                ^^^^
2019-08-13T00:30:52.8163219Z 
2019-08-13T00:30:52.8163264Z The actual stderr differed from the expected stderr.
2019-08-13T00:30:52.8164288Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/self/elision/ref-mut-self-async/ref-mut-self-async.stderr
2019-08-13T00:30:52.8164288Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/self/elision/ref-mut-self-async/ref-mut-self-async.stderr
2019-08-13T00:30:52.8164507Z To update references, rerun the tests and pass the `--bless` flag
2019-08-13T00:30:52.8164697Z To only update this specific test, also pass `--test-args self/elision/ref-mut-self-async.rs`
2019-08-13T00:30:52.8164754Z error: 1 errors occurred comparing output.
2019-08-13T00:30:52.8164803Z status: exit code: 1
2019-08-13T00:30:52.8164803Z status: exit code: 1
2019-08-13T00:30:52.8165358Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/self/elision/ref-mut-self-async.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/self/elision/ref-mut-self-async" "-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/self/elision/ref-mut-self-async/auxiliary" "-A" "unused"
2019-08-13T00:30:52.8165604Z ------------------------------------------
2019-08-13T00:30:52.8165627Z 
2019-08-13T00:30:52.8165798Z ------------------------------------------
2019-08-13T00:30:52.8165831Z stderr:
2019-08-13T00:30:52.8165831Z stderr:
2019-08-13T00:30:52.8166160Z ------------------------------------------
2019-08-13T00:30:52.8166213Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8166397Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:15:46
2019-08-13T00:30:52.8166436Z    |
2019-08-13T00:30:52.8166647Z LL |     async fn ref_self(&mut self, f: &u32) -> &u32 { //~ ERROR lifetime mismatch
2019-08-13T00:30:52.8167208Z    |                       ---------              ^^^^
2019-08-13T00:30:52.8167251Z    |                       |                      |
2019-08-13T00:30:52.8167403Z    |                       |                      ...but data from `f` is returned here
2019-08-13T00:30:52.8167449Z    |                       this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8167513Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8167743Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:21:52
2019-08-13T00:30:52.8167780Z    |
2019-08-13T00:30:52.8167780Z    |
2019-08-13T00:30:52.8167956Z LL |     async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
2019-08-13T00:30:52.8168250Z    |                             ---------              ^^^^
2019-08-13T00:30:52.8168290Z    |                             |                      |
2019-08-13T00:30:52.8168331Z    |                             |                      ...but data from `f` is returned here
2019-08-13T00:30:52.8168563Z    |                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8168631Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8168847Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:25:61
2019-08-13T00:30:52.8168889Z    |
2019-08-13T00:30:52.8168889Z    |
2019-08-13T00:30:52.8169078Z LL |     async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8169526Z    |                                     ---------               ^^^^
2019-08-13T00:30:52.8169567Z    |                                     |                       |
2019-08-13T00:30:52.8169611Z    |                                     |                       ...but data from `f` is returned here
2019-08-13T00:30:52.8169821Z    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8170078Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8170367Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:29:61
2019-08-13T00:30:52.8170434Z    |
2019-08-13T00:30:52.8170434Z    |
2019-08-13T00:30:52.8170683Z LL |     async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8171024Z    |                                     ---------               ^^^^
2019-08-13T00:30:52.8171104Z    |                                     |                       |
2019-08-13T00:30:52.8171160Z    |                                     |                       ...but data from `f` is returned here
2019-08-13T00:30:52.8171221Z    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8171317Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8171577Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:33:70
2019-08-13T00:30:52.8171687Z    |
2019-08-13T00:30:52.8171687Z    |
2019-08-13T00:30:52.8171940Z LL |     async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8172185Z    |                                             ---------                ^^^^
2019-08-13T00:30:52.8172249Z    |                                             |                        |
2019-08-13T00:30:52.8172331Z    |                                             |                        ...but data from `f` is returned here
2019-08-13T00:30:52.8172394Z    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8172489Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8172729Z   --> /checkout/src/test/ui/self/elision/ref-mut-self-async.rs:37:70
2019-08-13T00:30:52.8172777Z    |
2019-08-13T00:30:52.8172777Z    |
2019-08-13T00:30:52.8173039Z LL |     async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8173287Z    |                                             ---------                ^^^^
2019-08-13T00:30:52.8173342Z    |                                             |                        |
2019-08-13T00:30:52.8173416Z    |                                             |                        ...but data from `f` is returned here
2019-08-13T00:30:52.8173721Z    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8173793Z error: aborting due to 6 previous errors
2019-08-13T00:30:52.8173814Z 
2019-08-13T00:30:52.8173833Z 
2019-08-13T00:30:52.8174002Z ------------------------------------------
---
2019-08-13T00:30:52.8174395Z 10 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8174567Z -   --> $DIR/ref-self-async.rs:33:48
2019-08-13T00:30:52.8174718Z +   --> $DIR/ref-self-async.rs:30:48
2019-08-13T00:30:52.8174757Z 12    |
2019-08-13T00:30:52.8174925Z 13 LL |     async fn ref_Self(self: &Self, f: &u32) -> &u32 {
2019-08-13T00:30:52.8175112Z 14    |                             -----              ^^^^
2019-08-13T00:30:52.8175176Z 17    |                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8175228Z 18 
2019-08-13T00:30:52.8175259Z 19 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8175411Z -   --> $DIR/ref-self-async.rs:37:57
2019-08-13T00:30:52.8175411Z -   --> $DIR/ref-self-async.rs:37:57
2019-08-13T00:30:52.8175577Z +   --> $DIR/ref-self-async.rs:34:57
2019-08-13T00:30:52.8175609Z 21    |
2019-08-13T00:30:52.8175784Z 22 LL |     async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8175957Z 23    |                                     -----               ^^^^
2019-08-13T00:30:52.8176036Z 26    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8176078Z 27 
2019-08-13T00:30:52.8176126Z 28 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8176331Z -   --> $DIR/ref-self-async.rs:41:57
2019-08-13T00:30:52.8176331Z -   --> $DIR/ref-self-async.rs:41:57
2019-08-13T00:30:52.8176503Z +   --> $DIR/ref-self-async.rs:38:57
2019-08-13T00:30:52.8176551Z 30    |
2019-08-13T00:30:52.8176726Z 31 LL |     async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8176899Z 32    |                                     -----               ^^^^
2019-08-13T00:30:52.8176978Z 35    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8177013Z 36 
2019-08-13T00:30:52.8177043Z 37 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8177214Z -   --> $DIR/ref-self-async.rs:45:66
2019-08-13T00:30:52.8177214Z -   --> $DIR/ref-self-async.rs:45:66
2019-08-13T00:30:52.8177366Z +   --> $DIR/ref-self-async.rs:42:66
2019-08-13T00:30:52.8177398Z 39    |
2019-08-13T00:30:52.8177594Z 40 LL |     async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8177785Z 41    |                                             -----                ^^^^
2019-08-13T00:30:52.8177854Z 44    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8177906Z 45 
2019-08-13T00:30:52.8177937Z 46 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8178090Z -   --> $DIR/ref-self-async.rs:49:66
2019-08-13T00:30:52.8178090Z -   --> $DIR/ref-self-async.rs:49:66
2019-08-13T00:30:52.8178257Z +   --> $DIR/ref-self-async.rs:46:66
2019-08-13T00:30:52.8178289Z 48    |
2019-08-13T00:30:52.8178467Z 49 LL |     async fn box_pin_ref_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8178663Z 50    |                                             -----                ^^^^
2019-08-13T00:30:52.8178726Z 53    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8178761Z 54 
2019-08-13T00:30:52.8178808Z 55 error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8179049Z -   --> $DIR/ref-self-async.rs:53:69
2019-08-13T00:30:52.8179049Z -   --> $DIR/ref-self-async.rs:53:69
2019-08-13T00:30:52.8179206Z +   --> $DIR/ref-self-async.rs:50:69
2019-08-13T00:30:52.8179255Z 57    |
2019-08-13T00:30:52.8179436Z 58 LL |     async fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 {
2019-08-13T00:30:52.8180301Z 59    |                                            -----                    ^^^
2019-08-13T00:30:52.8180395Z 
2019-08-13T00:30:52.8180441Z The actual stderr differed from the expected stderr.
2019-08-13T00:30:52.8180739Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/self/elision/ref-self-async/ref-self-async.stderr
2019-08-13T00:30:52.8180739Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/self/elision/ref-self-async/ref-self-async.stderr
2019-08-13T00:30:52.8180997Z To update references, rerun the tests and pass the `--bless` flag
2019-08-13T00:30:52.8181292Z To only update this specific test, also pass `--test-args self/elision/ref-self-async.rs`
2019-08-13T00:30:52.8181396Z error: 1 errors occurred comparing output.
2019-08-13T00:30:52.8181456Z status: exit code: 1
2019-08-13T00:30:52.8181456Z status: exit code: 1
2019-08-13T00:30:52.8182239Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/self/elision/ref-self-async.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/self/elision/ref-self-async" "-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/self/elision/ref-self-async/auxiliary" "-A" "unused"
2019-08-13T00:30:52.8182591Z ------------------------------------------
2019-08-13T00:30:52.8182628Z 
2019-08-13T00:30:52.8182875Z ------------------------------------------
2019-08-13T00:30:52.8182922Z stderr:
2019-08-13T00:30:52.8182922Z stderr:
2019-08-13T00:30:52.8183146Z ------------------------------------------
2019-08-13T00:30:52.8183214Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8183587Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:24:42
2019-08-13T00:30:52.8183704Z    |
2019-08-13T00:30:52.8183930Z LL |     async fn ref_self(&self, f: &u32) -> &u32 { //~ ERROR lifetime mismatch
2019-08-13T00:30:52.8184093Z    |                       -----              ^^^^
2019-08-13T00:30:52.8184130Z    |                       |                  |
2019-08-13T00:30:52.8184183Z    |                       |                  ...but data from `f` is returned here
2019-08-13T00:30:52.8184225Z    |                       this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8184300Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8184471Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:30:48
2019-08-13T00:30:52.8184505Z    |
2019-08-13T00:30:52.8184505Z    |
2019-08-13T00:30:52.8184667Z LL |     async fn ref_Self(self: &Self, f: &u32) -> &u32 {
2019-08-13T00:30:52.8184848Z    |                             -----              ^^^^
2019-08-13T00:30:52.8184893Z    |                             |                  |
2019-08-13T00:30:52.8184937Z    |                             |                  ...but data from `f` is returned here
2019-08-13T00:30:52.8184997Z    |                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8185053Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8185242Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:34:57
2019-08-13T00:30:52.8185276Z    |
2019-08-13T00:30:52.8185276Z    |
2019-08-13T00:30:52.8185445Z LL |     async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8185629Z    |                                     -----               ^^^^
2019-08-13T00:30:52.8185667Z    |                                     |                   |
2019-08-13T00:30:52.8185707Z    |                                     |                   ...but data from `f` is returned here
2019-08-13T00:30:52.8185832Z    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8185887Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8186073Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:38:57
2019-08-13T00:30:52.8186124Z    |
2019-08-13T00:30:52.8186124Z    |
2019-08-13T00:30:52.8186294Z LL |     async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8186465Z    |                                     -----               ^^^^
2019-08-13T00:30:52.8186519Z    |                                     |                   |
2019-08-13T00:30:52.8186559Z    |                                     |                   ...but data from `f` is returned here
2019-08-13T00:30:52.8186603Z    |                                     this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8186675Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8186855Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:42:66
2019-08-13T00:30:52.8186905Z    |
2019-08-13T00:30:52.8186905Z    |
2019-08-13T00:30:52.8187087Z LL |     async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8187266Z    |                                             -----                ^^^^
2019-08-13T00:30:52.8187306Z    |                                             |                    |
2019-08-13T00:30:52.8187362Z    |                                             |                    ...but data from `f` is returned here
2019-08-13T00:30:52.8187407Z    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8187480Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8187652Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:46:66
2019-08-13T00:30:52.8187685Z    |
2019-08-13T00:30:52.8187685Z    |
2019-08-13T00:30:52.8187876Z LL |     async fn box_pin_ref_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
2019-08-13T00:30:52.8188062Z    |                                             -----                ^^^^
2019-08-13T00:30:52.8188155Z    |                                             |                    |
2019-08-13T00:30:52.8188217Z    |                                             |                    ...but data from `f` is returned here
2019-08-13T00:30:52.8188262Z    |                                             this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8188332Z error[E0623]: lifetime mismatch
2019-08-13T00:30:52.8188519Z   --> /checkout/src/test/ui/self/elision/ref-self-async.rs:50:69
2019-08-13T00:30:52.8188554Z    |
2019-08-13T00:30:52.8188554Z    |
2019-08-13T00:30:52.8188729Z LL |     async fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 {
2019-08-13T00:30:52.8188924Z    |                                            -----                    ^^^
2019-08-13T00:30:52.8188963Z    |                                            |                        |
2019-08-13T00:30:52.8189016Z    |                                            |                        ...but data from `f` is returned here
2019-08-13T00:30:52.8189077Z    |                                            this parameter and the return type are declared with different lifetimes...
2019-08-13T00:30:52.8189134Z error: aborting due to 7 previous errors
2019-08-13T00:30:52.8189172Z 
2019-08-13T00:30:52.8189190Z 
2019-08-13T00:30:52.8189344Z ------------------------------------------
2019-08-13T00:30:52.8189344Z ------------------------------------------
2019-08-13T00:30:52.8189367Z 
2019-08-13T00:30:52.8189386Z 
2019-08-13T00:30:52.8189941Z ---- [ui] ui/self/self_lifetime-async.rs stdout ----
2019-08-13T00:30:52.8189979Z 
2019-08-13T00:30:52.8190024Z error: ui test compiled successfully!
2019-08-13T00:30:52.8190068Z status: exit code: 0
2019-08-13T00:30:52.8190861Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/self/self_lifetime-async.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/self/self_lifetime-async" "-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/self/self_lifetime-async/auxiliary" "-A" "unused"
2019-08-13T00:30:52.8191303Z ------------------------------------------
2019-08-13T00:30:52.8191337Z 
2019-08-13T00:30:52.8191544Z ------------------------------------------
2019-08-13T00:30:52.8191607Z stderr:
---
2019-08-13T00:30:52.8193669Z test result: FAILED. 8863 passed; 4 failed; 33 ignored; 0 measured; 0 filtered out
2019-08-13T00:30:52.8193696Z 
2019-08-13T00:30:52.8198089Z 
2019-08-13T00:30:52.8198145Z 
2019-08-13T00:30:52.8199452Z 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-13T00:30:52.8200400Z 
2019-08-13T00:30:52.8200433Z 
2019-08-13T00:30:52.8200482Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-08-13T00:30:52.8200569Z Build completed unsuccessfully in 1:00:33
2019-08-13T00:30:52.8200569Z Build completed unsuccessfully in 1:00:33
2019-08-13T00:30:52.8200952Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-08-13T00:30:52.8201034Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-08-13T00:30:53.5931023Z ##[error]Bash exited with code '1'.
2019-08-13T00:30:53.5999656Z ##[section]Starting: Checkout
2019-08-13T00:30:53.6001949Z ==============================================================================
2019-08-13T00:30:53.6002006Z Task         : Get sources
2019-08-13T00:30:53.6002071Z 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)

@nikomatsakis

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

@bors r=cramertj

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

📌 Commit d7c7c52 has been approved by cramertj

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

@bors p=18

Centril added a commit to Centril/rust that referenced this pull request Aug 13, 2019

Rollup merge of rust-lang#63499 - nikomatsakis:issuee-63388-async-fn-…
…elision-self-mut-self, r=cramertj

handle elision in async fn correctly

We now always make fresh lifetimne parameters for all elided
lifetimes, whether they are in the inputs or outputs. But then
we generate `'_` in the case of elided lifetimes from the outputs.

Example:

```rust
async fn foo<'a>(x: &'a u32) -> &u32 { .. }
```

becomes

```rust
type Foo<'a, 'b> = impl Future<Output = &'b u32>;
fn foo<'a>(x: &'a u32) -> Foo<'a, '_>
```

Fixes rust-lang#63388

bors added a commit that referenced this pull request Aug 13, 2019

Auto merge of #63515 - Centril:rollup-r0z0yi8, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

Failed in #63515 (comment), @bors r-
(--bless --compare-mode=nll should be enough to make it work.)

@nikomatsakis

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

@bors r=cramertj

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

📌 Commit 18d69c8 has been approved by cramertj

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63499 - nikomatsakis:issuee-63388-async-fn-…
…elision-self-mut-self, r=cramertj

handle elision in async fn correctly

We now always make fresh lifetimne parameters for all elided
lifetimes, whether they are in the inputs or outputs. But then
we generate `'_` in the case of elided lifetimes from the outputs.

Example:

```rust
async fn foo<'a>(x: &'a u32) -> &u32 { .. }
```

becomes

```rust
type Foo<'a, 'b> = impl Future<Output = &'b u32>;
fn foo<'a>(x: &'a u32) -> Foo<'a, '_>
```

Fixes rust-lang#63388

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63541 - Centril:rollup-d3q7074, r=Centril
Rollup of 16 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)
 - #63534 (Bump to 1.39)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63499 - nikomatsakis:issuee-63388-async-fn-…
…elision-self-mut-self, r=cramertj

handle elision in async fn correctly

We now always make fresh lifetimne parameters for all elided
lifetimes, whether they are in the inputs or outputs. But then
we generate `'_` in the case of elided lifetimes from the outputs.

Example:

```rust
async fn foo<'a>(x: &'a u32) -> &u32 { .. }
```

becomes

```rust
type Foo<'a, 'b> = impl Future<Output = &'b u32>;
fn foo<'a>(x: &'a u32) -> Foo<'a, '_>
```

Fixes rust-lang#63388

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63508 (Do not ICE when synthesizing spans falling inside unicode chars)
 - #63511 (ci: add a check for clock drift)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)

Failed merges:

r? @ghost

@bors bors merged commit 18d69c8 into rust-lang:master Aug 14, 2019

2 of 4 checks passed

pr (Linux mingw-check)
Details
pr (Linux x86_64-gnu-llvm-6.0)
Details
pr Build #20190813.26 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.