Rollup of 5 pull requests by Centril · Pull Request #67493 · rust-lang/rust

Centril · 2019-12-21T17:45:42Z

Successful merges:

Make GATs less ICE-prone. #67160 (Make GATs less ICE-prone.)
[mir-opt] Fix Inline pass to handle inlining into box expressions #67333 ([mir-opt] Fix Inline pass to handle inlining into box expressions)
use _val to ignore parameter of any::type_name_of_val #67420 (use _val to ignore parameter of any::type_name_of_val)
Remove rustc-dev from the default nightly components #67469 (Remove rustc-dev from the default nightly components)
use Result::map_or for bootstrap #67491 (use Result::map_or for bootstrap)

Failed merges:

It was already filtered from other branches, but we only kept it in nightly's default to ease the transition. Now that the separation of rust-std/rustc-dev has reached the 1.40 release, it seems like a good time for that transition to end.

* Make some run-pass or check-pass * Use `#![allow(incomplete_features)]` * Update FIXMEs now that some of the issues have been addressed * Add regression tests

…atsakis Make GATs less ICE-prone. After this PR simple lifetime-generic associated types can now be used in a compiling program. There are two big limitations: * rust-lang#30472 has not been addressed in any way (see src/test/ui/generic-associated-types/iterable.rs) * Using type- and const-generic associated types errors because bound types and constants aren't handled by trait solving. * The errors are technically non-fatal, but they happen in a [part of the compiler](https://github.com/rust-lang/rust/blob/4abb0ad2731e9ac6fd5d64d4cf15b7c82e4b5a81/src/librustc_typeck/lib.rs#L298) that fairly aggressively stops compiling on errors. closes rust-lang#47206 closes rust-lang#49362 closes rust-lang#62521 closes rust-lang#63300 closes rust-lang#64755 closes rust-lang#67089

@oli-obk

…ce, r=oli-obk [mir-opt] Fix `Inline` pass to handle inlining into `box` expressions r? @oli-obk Before, the test case just ICE'd here: https://github.com/rust-lang/rust/blob/a605441e049f0b6d5f7715b94b8ac4662fd7fcf6/src/librustc_mir/transform/inline.rs#L668

use _val to ignore parameter of any::type_name_of_val mem::drop does the same thing too.

@Mark-Simulacrum

…k-Simulacrum Remove rustc-dev from the default nightly components It was already filtered from other branches, but we only kept it in nightly's default to ease the transition. Now that the separation of rust-std/rustc-dev has reached the 1.40 release, it seems like a good time for that transition to end. Closes rust-lang#67425. r? @Mark-Simulacrum

use Result::map_or for bootstrap

Centril · 2019-12-21T17:46:01Z

@bors r+ p=200 rollup=never

bors · 2019-12-21T17:46:03Z

📌 Commit eef3fbd has been approved by Centril

bors · 2019-12-21T17:46:04Z

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

bors · 2019-12-21T17:46:55Z

⌛ Testing commit eef3fbd with merge 102b7cd8e3442d57dc3056d12f7efd361faeec15...

rust-highfive · 2019-12-21T17:52:29Z

Your PR failed (pretty log, 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-12-21T17:48:15.3436808Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-21T17:48:15.3436939Z 
2019-12-21T17:48:15.3437100Z   git checkout -b <new-branch-name>
2019-12-21T17:48:15.3437403Z 
2019-12-21T17:48:15.3437745Z HEAD is now at 102b7cd8e Auto merge of #67493 - Centril:rollup-m8eeyh3, r=Centril
2019-12-21T17:48:15.3780573Z ##[section]Starting: Setup environment
2019-12-21T17:48:15.3894540Z ==============================================================================
2019-12-21T17:48:15.3894694Z Task         : Bash
2019-12-21T17:48:15.3894797Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-21T17:48:30.4211732Z Chocolatey v0.10.15
2019-12-21T17:49:22.0117449Z Installing the following packages:
2019-12-21T17:49:22.0122047Z msys2
2019-12-21T17:49:22.0127243Z By installing you accept licenses for the packages.
2019-12-21T17:51:02.8099893Z Error retrieving packages from source 'https://chocolatey.org/api/v2/':
2019-12-21T17:51:02.8100919Z  Could not connect to the feed specified at 'https://chocolatey.org/api/v2/'. Please verify that the package source (located in the Package Manager Settings) is valid and ensure your network connectivity.
2019-12-21T17:51:02.8111692Z msys2 not installed. The package was not found with the source(s) listed.
2019-12-21T17:51:02.8112326Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-21T17:51:02.8112783Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-21T17:51:02.8113144Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-21T17:51:02.8113638Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-21T17:51:02.8114203Z  assistance.
2019-12-21T17:51:02.8257301Z 
2019-12-21T17:51:02.8257965Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-21T17:51:02.8257965Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-21T17:51:02.8258284Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-21T17:51:02.8264409Z 
2019-12-21T17:51:02.8270487Z Failures
2019-12-21T17:51:02.8283895Z  - msys2 - msys2 not installed. The package was not found with the source(s) listed.
2019-12-21T17:51:02.8284484Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-21T17:51:02.8284745Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-21T17:51:02.8285052Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-21T17:51:02.8285536Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-21T17:51:02.8285741Z  assistance.
2019-12-21T17:51:03.1847145Z 
2019-12-21T17:51:03.1847145Z 
2019-12-21T17:51:03.1950011Z ##[error]Bash exited with code '1'.
2019-12-21T17:51:03.2096244Z ##[section]Starting: Checkout
2019-12-21T17:51:03.2213950Z ==============================================================================
2019-12-21T17:51:03.2214059Z Task         : Get sources
2019-12-21T17:51:03.2214135Z 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 · 2019-12-21T17:52:43Z

💔 Test failed - checks-azure

Centril · 2019-12-21T17:53:13Z

@bors retry

matthewjasper and others added 18 commits December 20, 2019 20:10

Check associated type implementations for generic mismatches

db6d0b1

Resolve names in the generics of impl associated types

c5028f6

Correctly lower paths to generic associated types

4b164f6

Correctly lower bounds on GATs

6394032

Use delay_span_bug less often

cd3ead1

Generate correct Deref predicate

0a5c91c

[mir-opt] Fix Inline pass to handle inlining into box expressions

bec4fc1

Move the rest of the mir-opt inline tests into a folder

f1325a7

Update tests for GATs

c268798

* Make some run-pass or check-pass * Use `#![allow(incomplete_features)]` * Update FIXMEs now that some of the issues have been addressed * Add regression tests

Fix rustdoc

e7b8bfe

use _val to ignore parameter of any::type_name_of_val

c93198f

use Result::map_or for bootstrap

f3d7e03

Rollup merge of rust-lang#67420 - lzutao:_val, r=Centril

2110d1b

use _val to ignore parameter of any::type_name_of_val mem::drop does the same thing too.

Rollup merge of rust-lang#67491 - lzutao:res-map-or, r=Mark-Simulacrum

eef3fbd

use Result::map_or for bootstrap

Centril added the rollup A PR which is a rollup label Dec 21, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 21, 2019

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 Dec 21, 2019

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 Dec 21, 2019

Centril closed this Dec 21, 2019

Centril deleted the rollup-m8eeyh3 branch December 21, 2019 18:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#67493

Rollup of 5 pull requests#67493
Centril wants to merge 18 commits intorust-lang:masterfrom
Centril:rollup-m8eeyh3

Centril commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

rust-highfive commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

Centril commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

rust-highfive commented Dec 21, 2019

Uh oh!

bors commented Dec 21, 2019

Uh oh!

Centril commented Dec 21, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants