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

Rollup of 4 pull requests #63606

Closed
wants to merge 16 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 15, 2019

Successful merges:

Failed merges:

r? @ghost

Centril and others added 16 commits August 13, 2019 23:54
…hton

Use libunwind from llvm-project submodule for musl targets

This avoid downloading libunwind by using the scheme introduced in rust-lang#61544
Suggest Rust 2018 on `<expr>.await` with no such field

When type checking a field projection (`fn check_field`) to `<expr>.await` where `<expr>: τ` and `τ` is not a primitive type, suggest switching to Rust 2018. E.g.

```
error[E0609]: no field `await` on type `std::pin::Pin<&mut dyn std::future::Future<Output = ()>>`
  --> $DIR/suggest-switching-edition-on-await.rs:31:7
   |
LL |     x.await;
   |       ^^^^^ unknown field
   |
   = note: to `.await` a `Future`, switch to Rust 2018
   = help: set `edition = "2018"` in `Cargo.toml`
   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
```

Fixes rust-lang#63533

This PR also performs some preparatory cleanups in `fn check_field`; the last 2 commits are where the suggestion is introduced and tested respectively.

r? @varkor
Feature gate 'yield $expr?' pre-expansion

Also improve the overall ergonomics of pre-expansion gating in general.

r? @Zoxc
…chton

Update rustc-demangle to 0.1.16.

Includes rust-lang/rustc-demangle#29 and rust-lang/rustc-demangle#30.
You can see the effects of the former in the testcase changes.

r? @alexcrichton cc @davidtwco @michaelwoerister
@Centril
Copy link
Contributor Author

Centril commented Aug 15, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Aug 15, 2019

📌 Commit 7a6bf66 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 15, 2019
@Centril Centril closed this Aug 15, 2019
@Centril Centril deleted the rollup-lc7olrn branch August 15, 2019 17:13
@rust-highfive
Copy link
Collaborator

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-15T17:14:04.6507007Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-15T17:14:04.6741547Z ##[command]git config gc.auto 0
2019-08-15T17:14:04.7128500Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-15T17:14:04.7178385Z ##[command]git config --get-all http.proxy
2019-08-15T17:14:04.7316691Z ##[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/63606/merge:refs/remotes/pull/63606/merge
2019-08-15T17:14:05.4930758Z fatal: couldn't find remote ref refs/pull/63606/merge
2019-08-15T17:14:05.5883475Z ##[warning]Git fetch failed with exit code 128, back off 1.358 seconds before retry.
2019-08-15T17:14:06.8817785Z ##[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/63606/merge:refs/remotes/pull/63606/merge
2019-08-15T17:14:07.5208889Z fatal: couldn't find remote ref refs/pull/63606/merge
2019-08-15T17:14:07.5720823Z ##[warning]Git fetch failed with exit code 128, back off 4.668 seconds before retry.
2019-08-15T17:14:12.1879379Z ##[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/63606/merge:refs/remotes/pull/63606/merge
2019-08-15T17:14:12.7688708Z fatal: couldn't find remote ref refs/pull/63606/merge
2019-08-15T17:14:12.8141838Z ##[error]Git fetch failed with exit code: 128
2019-08-15T17:14:12.8419800Z ##[section]Starting: Checkout
2019-08-15T17:14:12.8421160Z ==============================================================================
2019-08-15T17:14:12.8421206Z Task         : Get sources
2019-08-15T17:14:12.8421244Z 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 Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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.

5 participants