Skip to content

Allow named lifetimes in async functions.#54000

Merged
bors merged 2 commits intorust-lang:masterfrom
jkozlowski:fix-53174
Sep 10, 2018
Merged

Allow named lifetimes in async functions.#54000
bors merged 2 commits intorust-lang:masterfrom
jkozlowski:fix-53174

Conversation

@jkozlowski
Copy link
Contributor

@jkozlowski jkozlowski commented Sep 6, 2018 •
edited
Loading

Code by @eddyb; @cramertj suggested I lift it off another change so we can fix #53174.

r? @cramertj

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2018
@cramertj
Copy link
Member

cramertj commented Sep 6, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 6, 2018

📌 Commit 4088a38 has been approved by cramertj

@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 Sep 6, 2018
@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 6, 2018

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (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. 

[00:04:50] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:74: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:118: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:172: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:186: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:187: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:188: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:189: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:190: trailing whitespace
[00:04:50] tidy error: /checkout/src/test/run-pass/async-await.rs:198: trailing whitespace
[00:04:50] tidy error: /checkout/src/librustc/hir/map/def_collector.rs: missing trailing newline
[00:04:52] some tidy checks failed
[00:04:52] 
[00:04:52] 
[00:04:52] 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" "--quiet"
[00:04:52] 
[00:04:52] 
[00:04:52] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:52] Build completed unsuccessfully in 0:00:50
[00:04:52] Build completed unsuccessfully in 0:00:50
[00:04:52] Makefile:79: recipe for target 'tidy' failed
[00:04:52] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0022d8f8
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0ae34660:start=1536259360693083477,finish=1536259360700226392,duration=7142915
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:11b2d16d
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:042f9f78
travis_time:start:042f9f78
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:02d32ee8
$ dmesg | grep -i kill

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)

@cramertj
Copy link
Member

cramertj commented Sep 6, 2018

@bors r- tidy whitespace failures

@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 Sep 6, 2018
@jkozlowski
Copy link
Contributor Author

jkozlowski commented Sep 6, 2018

Will fixup

@jkozlowski
Copy link
Contributor Author

jkozlowski commented Sep 6, 2018

Let's hope that's it. I'm really surprised VSCode doesn't do this kind of formatting by default.

@eddyb
Copy link
Member

eddyb commented Sep 6, 2018

@jkozlowski It has settings for stuff like this, they're just not enabled by default. Sadly I can't remember how to search for them, but I think "trailing" is a good starting point.

@jkozlowski
Copy link
Contributor Author

jkozlowski commented Sep 6, 2018

Indeed you are right! I use IntelliJ day-to-day, but for some reason for Rust VSCode stuck with me :) Thanks for the code btw @eddyb, I have spent a few hours chasing the wrong rabbit hole on this.

@jkozlowski
Copy link
Contributor Author

jkozlowski commented Sep 6, 2018

Ok we're all good here :)

@cramertj
Copy link
Member

cramertj commented Sep 6, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 6, 2018

📌 Commit 4b7f2eb has been approved by cramertj

@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 Sep 6, 2018
@Centril Centril added the A-async-await Area: Async & Await label Sep 8, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 8, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#54000 - jkozlowski:fix-53174, r=cramertj
0eb8ea9 
Allow named lifetimes in async functions.

- Fixes rust-lang#53174

Code by @eddyb; @cramertj suggested I lift it off another change so we can fix rust-lang#53174.

r? @cramertj
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 8, 2018
Closed
@bors
Copy link
Collaborator

bors commented Sep 10, 2018

⌛ Testing commit 4b7f2eb with merge 3c3e372...

bors added a commit that referenced this pull request Sep 10, 2018
@bors
Auto merge of #54000 - jkozlowski:fix-53174, r=cramertj
3c3e372 
Allow named lifetimes in async functions.

- Fixes #53174

Code by @eddyb; @cramertj suggested I lift it off another change so we can fix #53174.

r? @cramertj
@bors
Copy link
Collaborator

bors commented Sep 10, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: cramertj
Pushing 3c3e372 to master...

@bors bors merged commit 4b7f2eb into rust-lang:master Sep 10, 2018
@bors bors mentioned this pull request Sep 10, 2018
Merged
@jkozlowski jkozlowski deleted the fix-53174 branch September 10, 2018 16:16
@Arnavion Arnavion mentioned this pull request Sep 12, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cramertj cramertj

Labels

A-async-await Area: Async & Await S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ICE when using async with references with named lifetimes as arguments

6 participants

@jkozlowski @cramertj @bors @rust-highfive @eddyb @Centril