Skip to content

Rollup of 8 pull requests #70692

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 20 commits into from
Apr 2, 2020
Merged

Rollup of 8 pull requests #70692

merged 20 commits into from
Apr 2, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 2, 2020

Successful merges:

Failed merges:

r? @ghost

KamilaBorowska and others added 20 commits March 22, 2020 20:10
The modified code to handle parsing raw strings didn't properly account for the case where there was no "#" on either end and erroneously reported this strings as complete. This lead to a panic trying to read off the end of the file.
This commit adds a STILL_FURTHER_SPECIALIZABLE flag to `TypeFlags`
which replaces `needs_infer` and `needs_subst` in `Instance::resolve`
and `assemble_candidates_from_impls.`

Signed-off-by: David Wood <david@davidtw.co>
Implement Hash for Infallible

https://www.reddit.com/r/rust/comments/fmllgx/never_crate_stable_alternative_to/ lists not implementing `Hash` as a reason for the `never` crate. I see no reason not to implement `Hash` for `Infallible`, so might as well do it.

No changes necessary for `!`, because `!` already implements `Hash` (see rust-lang#51404).
… r=estebank

parse: recover on `const fn()` / `async fn()`

Recover on `const fn()` and `async fn()` function pointers, suggesting to remove the qualifier.
For example:
```
error: an `fn` pointer type cannot be `async`
  --> $DIR/recover-const-async-fn-ptr.rs:6:11
   |
LL | type T3 = async fn();
   |           -----^^^^^
   |           |
   |           `async` because of this
   |           help: remove the `async` qualifier
```

r? @estebank
Renamed `PerDefTables` to `Tables`

Originally suggested by @eddyb
Update cargo

8 commits in 8a0d4d9c9abc74fd670353094387d62028b40ae9..6e07d2dfb7fc87b1c9489de41da4dafa239daf03
2020-03-24 17:57:04 +0000 to 2020-03-31 03:22:39 +0000
- Fix man page typo for "Owner Options". (rust-lang/cargo#8057)
- enable progress bar on all UNIX platforms (rust-lang/cargo#8054)
- Squelch some rustdoc warnings. (rust-lang/cargo#8052)
- Remove clippy tests. (rust-lang/cargo#8053)
- Fix -Zfeatures=itarget with certain host dependencies (rust-lang/cargo#8048)
- Checking for binary that is built as an implicit dependency of an integration test. (rust-lang/cargo#8020)
- Use stabilized version of rustdoc's --crate-version (rust-lang/cargo#8039)
- Remove the `git-checkout` subcommand. (rust-lang/cargo#8040)
…ulacrum

Remove some reexports in `rustc_middle`

This will help get these imports out of the way of detecting the true dependencies in and out to `rustc_middle`, thereby helping future work towards rust-lang#65031.
…-specializable, r=eddyb

add `STILL_FURTHER_SPECIALIZABLE` flag

Contributes to rust-lang#70285.

This PR adds a `STILL_FURTHER_SPECIALIZABLE` flag to `TypeFlags`
which replaces `needs_infer` and `needs_subst` in `Instance::resolve`
and `assemble_candidates_from_impls`.

r? @eddyb
Add missing markdown rust annotation
…=petrochenkov

Handle unterminated raw strings with no #s properly

The modified code to handle parsing raw strings didn't properly account for the case where there was no "#" on either end and erroneously reported this strings as complete. This lead to a panic trying to read off the end of the file.

Fixes rust-lang#70677

r? @petrochenkov

cc @Centril
@Centril
Copy link
Contributor Author

Centril commented Apr 2, 2020

Enlarging #70688, @bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 2, 2020

📌 Commit ec0da72 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 Apr 2, 2020
@Centril Centril added the rollup A PR which is a rollup label Apr 2, 2020
@bors
Copy link
Collaborator

bors commented Apr 2, 2020

⌛ Testing commit ec0da72 with merge 9ada008f54f99fe37deb2b9700bd1afcbf0272ef...

@bors
Copy link
Collaborator

bors commented Apr 2, 2020

💔 Test failed - checks-azure

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

Centril commented Apr 2, 2020

@bors retry spurious

@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 Apr 2, 2020
@bors
Copy link
Collaborator

bors commented Apr 2, 2020

⌛ Testing commit ec0da72 with merge 537ccdf...

@bors
Copy link
Collaborator

bors commented Apr 2, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 537ccdf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 2, 2020
@bors bors merged commit 537ccdf into rust-lang:master Apr 2, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #70692!

Tested on commit 537ccdf.
Direct link to PR: #70692

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

9 participants