Clean up type alias impl trait implementation #72080

matthewjasper · 2020-05-10T12:39:56Z

Removes special case for top-level impl trait
Removes associated opaque types
Forbid lifetime elision in let position impl trait. This is consistent with the behavior for inferred types.
Handle lifetimes in type alias impl trait more uniformly with other parameters

cc #69323
cc #63063
Closes #57188
Closes #62988
Closes #69136
Closes #73061

rust-highfive · 2020-05-10T12:40:00Z

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2020-05-10T13:52:45Z

The job mingw-check of 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.

##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 5'
Agent machine name: 'fv-az578'
Current agent version: '2.168.2'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200430.2
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200430.2/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.1)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/16b01af5-3b80-4fa1-b5f7-44c64dbabe31.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/72080/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[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/72080/merge:refs/remotes/pull/72080/merge
---
 ---> 3adb0605cc65
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
 ---> Using cache
 ---> 28dbc326cb7f
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors &&            python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python3 ../x.py build --stage 0 src/tools/build-manifest &&            python3 ../x.py test --stage 0 src/tools/compiletest &&            python3 ../x.py test src/tools/tidy &&            python3 ../x.py doc --stage 0 src/libstd &&            /scripts/validate-toolstate.sh
 ---> 537a01811900
Successfully built 537a01811900
Successfully tagged rust-ci:latest
Built container sha256:537a018119009dc218456238dec90b5530050db1e2a1e166550c218003f6159d
---
    Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
    Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
    Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking chalk-rust-ir v0.10.0
    Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
    Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
     |
1143 |             hir::ImplItemKind::OpaqueTy(ref bounds) => OpaqueTyItem(
     |                                ^^^^^^^^ variant or associated item not found in `rustc_hir::ImplItemKind<'_>`

error[E0599]: no variant or associated item named `OpaqueTy` found for enum `rustc_middle::ty::AssocKind` in the current scope
     |
1313 |             ty::AssocKind::OpaqueTy => unimplemented!(),
     |                            ^^^^^^^^ variant or associated item not found in `rustc_middle::ty::AssocKind`

---
  local time: Sun May 10 12:48:58 UTC 2020
  network time: Sun, 10 May 2020 12:48:59 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/72080/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/72080/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (4263) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

davidtwco · 2020-05-15T15:23:35Z

r? @eddyb

bors · 2020-05-21T07:26:47Z

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

eddyb · 2020-05-25T17:07:32Z

Sorry for not seeing this earlier. Also, I'm not the best person to review this (but I will go through it).

r? @nikomatsakis

eddyb

Seems pretty good, overall, especially all the removed code. I'll let @nikomatsakis take a closer look though.

src/librustc_typeck/check/wfcheck.rs

matthewjasper · 2020-06-03T19:16:28Z

src/librustc_ast_lowering/lib.rs

+        } else {
+            // Non return-position impl trait captures all of the lifetimes of
+            // the parent item.
+            (&[], &[])


This needs to include the bound regions that the type captures.

Is your intent to patch this code?

Yes, although it ended up being a somewhat large change.

nikomatsakis

This all looks good. I left various comments and nits.

src/librustc_typeck/check/wfcheck.rs

src/librustc_ast_lowering/item.rs

nikomatsakis · 2020-06-03T19:47:08Z

src/librustc_ast_lowering/lib.rs

+        } else {
+            // Non return-position impl trait captures all of the lifetimes of
+            // the parent item.
+            (&[], &[])


Is your intent to patch this code?

src/librustc_typeck/astconv.rs

src/test/ui/impl-trait/negative-reasoning.rs

src/librustc_resolve/late/lifetimes.rs

src/librustc_typeck/collect/type_of.rs

jonhoo · 2020-06-07T14:17:21Z

Since this also fixes #73061, it'd be good to add a regression test for that + add it to the "closes" list.

jonhoo · 2020-06-07T14:24:59Z

I wonder if this change is also going to make it easier to fix #65863.

matthewjasper · 2020-06-07T20:57:46Z

I don't think this helps with #65863, because this doesn't change the AST representation of impl trait types.

jonhoo · 2020-06-08T12:45:20Z

I don't think this helps with #65863, because this doesn't change the AST representation of impl trait types.

Ah, yes, that makes sense. Just a test for #73061 would be good then.

nikomatsakis · 2020-06-10T20:39:26Z

@bors r+

bors · 2020-06-10T20:39:28Z

📌 Commit 51a6550 has been approved by nikomatsakis

bors · 2020-06-10T20:39:28Z

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

jonhoo · 2020-06-11T15:25:58Z

@matthewjasper Oh, I'm sorry, I scrolled through looking for it, but it must have been collapsed by GitHub somehow! Sorry for the noise ❤️

rust-highfive · 2020-06-11T15:42:51Z

The job mingw-check of 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.

##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 18'
Agent machine name: 'fv-az578'
Current agent version: '2.170.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200604.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200604.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/c0d787f4-859b-4556-80f4-deef351dcf86.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/72080/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[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/72080/merge:refs/remotes/pull/72080/merge
---
 ---> f883e675ad62
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
 ---> Using cache
 ---> c0b156eb069c
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors &&            python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python3 ../x.py build --stage 0 src/tools/build-manifest &&            python3 ../x.py test --stage 0 src/tools/compiletest &&            python3 ../x.py test src/tools/tidy &&            python3 ../x.py doc --stage 0 src/libstd &&            /scripts/validate-toolstate.sh
 ---> 8541bab6b38c
Successfully built 8541bab6b38c
Successfully tagged rust-ci:latest
Built container sha256:8541bab6b38c07f1b7eb787539b9cbe93daa6ac4458d3d7bd8a8921622a14ba1
---
    Checking rustc_span v0.0.0 (/checkout/src/librustc_span)
    Checking rustc_errors v0.0.0 (/checkout/src/librustc_errors)
    Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
    Checking rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
    Checking chalk-rust-ir v0.10.0
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking rustc_session v0.0.0 (/checkout/src/librustc_session)
    Checking chalk-solve v0.10.0
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
---

To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
Build completed unsuccessfully in 0:05:11
== clock drift check ==
  local time: Thu Jun 11 15:33:32 UTC 2020
  local time: Thu Jun 11 15:33:32 UTC 2020
  network time: Thu, 11 Jun 2020 15:33:32 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/72080/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/72080/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3542) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

matthewjasper · 2020-06-11T17:04:11Z

@bors r=nikomatsakis

bors · 2020-06-11T17:04:12Z

📌 Commit 8b10d42 has been approved by nikomatsakis

bors · 2020-06-15T04:10:35Z

⌛ Testing commit 8b10d42 with merge ce6d3a7...

RalfJung · 2020-06-15T08:05:14Z

Somehow Windows x86_64 msvc-2 is almost at 4h now (and will likely timeout) even though it usually takes <3h.

bors · 2020-06-15T08:09:31Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing ce6d3a7 to master...

RalfJung · 2020-06-15T08:10:52Z

Oh wow, it just barely made it. Nice :D

…ikomatsakis Clean up type alias impl trait implementation - Removes special case for top-level impl trait - Removes associated opaque types - Forbid lifetime elision in let position impl trait. This is consistent with the behavior for inferred types. - Handle lifetimes in type alias impl trait more uniformly with other parameters cc rust-lang#69323 cc rust-lang#63063 Closes rust-lang#57188 Closes rust-lang#62988 Closes rust-lang#69136 Closes rust-lang#73061

See rust-lang/rust#72080.

Fix breakage due to rust-lang/rust#72080 See rust-lang/rust#72080.

matthewjasper added F-type_alias_impl_trait `#[feature(type_alias_impl_trait)]` F-impl_trait_in_bindings `#![feature(impl_trait_in_bindings)]` labels May 10, 2020

rust-highfive assigned davidtwco May 10, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 10, 2020

matthewjasper force-pushed the uniform-impl-trait branch from c808d4f to 8be87df Compare May 10, 2020 14:06

rust-highfive assigned eddyb and unassigned davidtwco May 15, 2020

rust-highfive assigned nikomatsakis and unassigned eddyb May 25, 2020

eddyb reviewed May 25, 2020

View reviewed changes

marmeladema reviewed May 30, 2020

View reviewed changes

src/librustc_typeck/check/wfcheck.rs Outdated Show resolved Hide resolved

matthewjasper commented Jun 3, 2020

View reviewed changes

nikomatsakis requested changes Jun 3, 2020

View reviewed changes

matthewjasper mentioned this pull request Jun 7, 2020

ICE in rustdoc when using type_alias_impl_trait #73061

Closed

This was referenced Jun 7, 2020

Documentation fails to build constellation-rs/amadeus#54

Closed

Rustdoc cannot infer type when using type_alias_impl_trait, while rustc works #65863

Closed

matthewjasper force-pushed the uniform-impl-trait branch 2 times, most recently from 7245c19 to 51a6550 Compare June 7, 2020 19:42

matthewjasper force-pushed the uniform-impl-trait branch from e9caf48 to 985f3a6 Compare June 11, 2020 15:25

matthewjasper added 4 commits June 11, 2020 17:08

Rename TyKind::Def to OpaqueDef

ee0d3c7

Allow all impl trait types to capture bound lifetimes

1e0832f

Document some opaque types code

f975ece

Fix NLL test

8b10d42

matthewjasper force-pushed the uniform-impl-trait branch from 985f3a6 to 8b10d42 Compare June 11, 2020 16:08

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 11, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2020

bors merged commit ce6d3a7 into rust-lang:master Jun 15, 2020

bors mentioned this pull request Jun 15, 2020

Expand "recursive opaque type" diagnostic #71338

Merged

matthewjasper deleted the uniform-impl-trait branch June 15, 2020 08:17

This was referenced Jun 15, 2020

move leak-check to during coherence, candidate eval #72493

Merged

Implement associated lang items #72559

Merged

Alexendoo mentioned this pull request Jun 17, 2020

ICE with impl_trait_in_bindings #69840

Closed

hellow554 mentioned this pull request Jul 9, 2020

ICE when playing around with existential types, impl trait #74018

Closed

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 16, 2020

Fix breakage due to rust-lang/rust#72080

cfdef58

See rust-lang/rust#72080.

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 17, 2020

Fix breakage due to rust-lang/rust#72080

7395e03

See rust-lang/rust#72080.

Xanewok mentioned this pull request Nov 17, 2020

Fix breakage due to rust-lang/rust#72080 rust-lang/rust-semverver#142

Merged

bors added a commit to rust-lang/rust-semverver that referenced this pull request Nov 17, 2020

Auto merge of #142 - Xanewok:rustup, r=Xanewok

b9d358f

Fix breakage due to rust-lang/rust#72080 See rust-lang/rust#72080.

steffahn mentioned this pull request Feb 4, 2021

The "type_alias_impl_trait" feature has problems handling lifetime parameters. #69137

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up type alias impl trait implementation #72080

Clean up type alias impl trait implementation #72080

matthewjasper commented May 10, 2020 •

edited

Loading

rust-highfive commented May 10, 2020

rust-highfive commented May 10, 2020

davidtwco commented May 15, 2020

bors commented May 21, 2020

eddyb commented May 25, 2020

eddyb left a comment

matthewjasper Jun 3, 2020

nikomatsakis Jun 3, 2020

matthewjasper Jun 7, 2020

nikomatsakis left a comment

nikomatsakis Jun 3, 2020

jonhoo commented Jun 7, 2020 •

edited

Loading

jonhoo commented Jun 7, 2020

matthewjasper commented Jun 7, 2020

jonhoo commented Jun 8, 2020

nikomatsakis commented Jun 10, 2020

bors commented Jun 10, 2020

bors commented Jun 10, 2020

jonhoo commented Jun 11, 2020

rust-highfive commented Jun 11, 2020

matthewjasper commented Jun 11, 2020

bors commented Jun 11, 2020

bors commented Jun 15, 2020

RalfJung commented Jun 15, 2020

bors commented Jun 15, 2020

RalfJung commented Jun 15, 2020

Clean up type alias impl trait implementation #72080

Clean up type alias impl trait implementation #72080

Conversation

matthewjasper commented May 10, 2020 • edited Loading

rust-highfive commented May 10, 2020

rust-highfive commented May 10, 2020

davidtwco commented May 15, 2020

bors commented May 21, 2020

eddyb commented May 25, 2020

eddyb left a comment

Choose a reason for hiding this comment

matthewjasper Jun 3, 2020

Choose a reason for hiding this comment

nikomatsakis Jun 3, 2020

Choose a reason for hiding this comment

matthewjasper Jun 7, 2020

Choose a reason for hiding this comment

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Jun 3, 2020

Choose a reason for hiding this comment

jonhoo commented Jun 7, 2020 • edited Loading

jonhoo commented Jun 7, 2020

matthewjasper commented Jun 7, 2020

jonhoo commented Jun 8, 2020

nikomatsakis commented Jun 10, 2020

bors commented Jun 10, 2020

bors commented Jun 10, 2020

jonhoo commented Jun 11, 2020

rust-highfive commented Jun 11, 2020

matthewjasper commented Jun 11, 2020

bors commented Jun 11, 2020

bors commented Jun 15, 2020

RalfJung commented Jun 15, 2020

bors commented Jun 15, 2020

RalfJung commented Jun 15, 2020

matthewjasper commented May 10, 2020 •

edited

Loading

jonhoo commented Jun 7, 2020 •

edited

Loading