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

typeck: merge opaque type inference logic #62090

Merged

Conversation

Projects
None yet
5 participants
@davidtwco
Copy link
Member

commented Jun 24, 2019

Fixes #55872. See relevant Zulip topic.

r? @nikomatsakis

@davidtwco davidtwco force-pushed the davidtwco:ice-async-await-out-of-range-substitution branch from cdf4107 to ffcb481 Jun 25, 2019

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

commented Jul 1, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 1, 2019

📌 Commit ffcb481 has been approved by nikomatsakis

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 3, 2019

☔️ The latest upstream changes (presumably #61775) made this pull request unmergeable. Please resolve the merge conflicts.

typeck: merge opaque type inference logic
This commit merges the logic used for opaque type type inference for
impl Trait and non-impl Trait cases. This fixes an ICE where
existential types used in the return types of functions would be allowed
to have an out-of-scope generic type parameter.

@davidtwco davidtwco force-pushed the davidtwco:ice-async-await-out-of-range-substitution branch from ffcb481 to de8660a Jul 3, 2019

@davidtwco

This comment has been minimized.

Copy link
Member Author

commented Jul 8, 2019

@bors r=nikomatsakis

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 8, 2019

📌 Commit de8660a has been approved by nikomatsakis

Centril added a commit to Centril/rust that referenced this pull request Jul 8, 2019

@Centril Centril referenced this pull request Jul 8, 2019

Closed

Rollup of 3 pull requests #62498

bors added a commit that referenced this pull request Jul 8, 2019

Auto merge of #62498 - Centril:rollup-9iqlywc, r=Centril
Rollup of 3 pull requests

Successful merges:

 - #62090 (typeck: merge opaque type inference logic)
 - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait)
 - #62432 (Update rustfmt to 1.3.2)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 8, 2019

@Centril Centril referenced this pull request Jul 8, 2019

Closed

Rollup of 4 pull requests #62509

bors added a commit that referenced this pull request Jul 9, 2019

Auto merge of #62509 - Centril:rollup-lod7gdi, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #61613 (Support `impl Trait` in inlined documentation)
 - #62090 (typeck: merge opaque type inference logic)
 - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait)
 - #62494 (Remove unused dependencies)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 9, 2019

@Centril Centril referenced this pull request Jul 9, 2019

Closed

Rollup of 3 pull requests #62510

bors added a commit that referenced this pull request Jul 9, 2019

Auto merge of #62510 - Centril:rollup-385d6c6, r=Centril
Rollup of 3 pull requests

Successful merges:

 - #62090 (typeck: merge opaque type inference logic)
 - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait)
 - #62494 (Remove unused dependencies)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 9, 2019

@Centril Centril referenced this pull request Jul 9, 2019

Merged

Rollup of 4 pull requests #62511

bors added a commit that referenced this pull request Jul 9, 2019

Auto merge of #62511 - Centril:rollup-ojzb35x, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #60458 (Add key and value methods to DebugMap)
 - #62090 (typeck: merge opaque type inference logic)
 - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait)
 - #62494 (Remove unused dependencies)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 9, 2019

⌛️ Testing commit de8660a with merge 909f5a0...

@bors bors merged commit de8660a into rust-lang:master Jul 9, 2019

3 of 4 checks passed

homu Testing commit de8660ab610f046bbdeb1a90f2c94cba1d3d3185 with merge 909f5a049415a815b23502a5498de9a99bbf276b...
Details
pr Build #20190703.10 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details

@davidtwco davidtwco deleted the davidtwco:ice-async-await-out-of-range-substitution branch Jul 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.