Skip to content

Rollup of 7 pull requests - #67495

Merged
bors merged 22 commits into
rust-lang:masterfrom
Centril:rollup-6aer3xg
Dec 22, 2019
Merged

Rollup of 7 pull requests#67495
bors merged 22 commits into
rust-lang:masterfrom
Centril:rollup-6aer3xg

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

matthewjasperand others added 22 commits December 20, 2019 20:10
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
It was essentially unused, likely leftover from a previous refactoring
iteration.
…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.
closesrust-lang#47206closesrust-lang#49362closesrust-lang#62521closesrust-lang#63300closesrust-lang#64755closesrust-lang#67089
use _val to ignore parameter of any::type_name_of_val
mem::drop does the same thing too.
…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.
Closesrust-lang#67425.
r? @Mark-Simulacrum
…ntril
Drop petgraph dependency from bootstrap
It was essentially unused, likely leftover from a previous refactoring iteration. This should hopefully help reduce bootstrap build times a little, dropping petgraph, fixedbitset, and ordermap from the dependency set.
r? @alexcrichton
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=200 rollup=never

@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 7d29704 has been approved by Centril

@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors 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

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7d29704 with merge 5535c25...

bors added a commit that referenced this pull request Dec 21, 2019
Rollup of 7 pull requests
Successful merges:
- #67160 (Make GATs less ICE-prone.)
- #67333 ([mir-opt] Fix `Inline` pass to handle inlining into `box` expressions)
- #67420 (use _val to ignore parameter of any::type_name_of_val)
- #67469 (Remove rustc-dev from the default nightly components)
- #67489 (Drop petgraph dependency from bootstrap)
- #67490 (Document privacy of RangeInclusive fields)
- #67491 (use Result::map_or for bootstrap)
Failed merges:
r? @ghost
@bors

bors commented Dec 22, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 5535c25 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2019
@bors
bors merged commit 7d29704 into rust-lang:masterDec 22, 2019
@Centril
Centril deleted the rollup-6aer3xg branch December 22, 2019 00:11
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Dec 23, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

8 participants

@Centril@bors@JohnTitor@matthewjasper@cuviper@wesleywiser@Mark-Simulacrum@tesuji