Do not attempt to ascribe projections out of a ty var #55637

pnkfelix · 2018-11-03T01:05:43Z

If we encounter _ ascribed to structural pattern like (a, b), just skip relate_types.

Fix #55552

…t skip relate_types.

rust-highfive · 2018-11-03T01:05:46Z

r? @varkor

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

pnkfelix · 2018-11-03T01:08:01Z

r? @nikomatsakis

nikomatsakis · 2018-11-06T14:39:58Z

src/librustc/mir/tcx.rs

+        self,
+        tcx: TyCtxt<'a, 'gcx, 'tcx>,
+        elem: &ProjectionElem<'tcx, V, T>,
+        mut handle_field: impl FnMut(&Self, &Field, &T) -> Result<Ty<'tcx>, E>)


Nit: rustfmt would put the ) on the next line.

nikomatsakis · 2018-11-06T14:41:30Z

@bors r+

bors · 2018-11-06T14:41:32Z

📌 Commit 1bbaa55 has been approved by nikomatsakis

nikomatsakis · 2018-11-06T14:46:36Z

@pnkfelix and I were discussing this PR and we observed that it could cause problems if you have repeated type variables, e.g., type Foo<T> = (T, T) and an annotation like Foo<_>

pnkfelix · 2018-11-08T15:33:12Z

discussed at T-compiler meeting. beta-accepting (with a wee bit of trepidation from @nagisa )

pietroalbini · 2018-11-09T12:12:46Z

@bors p=1 (beta accepted)

bors · 2018-11-09T12:46:05Z

⌛ Testing commit 1bbaa55 with merge 041e18f00bcde960a131884b391f59a077a6b5a3...

bors · 2018-11-09T14:24:08Z

💔 Test failed - status-appveyor

pnkfelix · 2018-11-09T14:53:41Z

---- support::resolver::meta_test_multiple_versions_strategy stdout ----
thread 'support::resolver::meta_test_multiple_versions_strategy' panicked at 'In 640 tries we did not see a wide enough distribution of multiple versions of the same library! dis: [387, 79, 51, 20, 16, 15, 2, 0, 3, 12]', tools\cargo\tests\testsuite\support\resolver.rs:484:5
failures:
    support::resolver::meta_test_multiple_versions_strategy
test result: FAILED. 1440 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out
error: test failed, to rerun pass '--test testsuite'

... that message ... sounds like a spurious failure to me ...?

pnkfelix · 2018-11-09T14:53:55Z

@bors r+

bors · 2018-11-09T14:53:56Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: Support for the program data address space option of LLVM's Target Datalayout #54993

bors · 2018-11-09T14:53:58Z

📌 Commit 1bbaa55 has been approved by pnkfelix

pnkfelix · 2018-11-09T14:54:19Z

@bors r=nikomatsakis

bors · 2018-11-09T14:54:20Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Support for the program data address space option of LLVM's Target Datalayout #54993

bors · 2018-11-09T14:54:21Z

📌 Commit 1bbaa55 has been approved by nikomatsakis

pnkfelix · 2018-11-09T14:54:30Z

@bors retry

pnkfelix · 2018-11-09T14:54:51Z

@bors p=1 (beta accepted)

bjorn3

Noticed some spell errors.

bjorn3 · 2018-11-09T16:38:12Z

src/librustc_mir/borrow_check/nll/type_check/mod.rs

-                let mut projected_ty = PlaceTy::from_ty(ty);
+                let ty = self.normalize(ty, locations);
+
+                // We need to follow any provided projetions into the type.


Suggested change

// We need to follow any provided projetions into the type.

// We need to follow any provided projections into the type.

bjorn3 · 2018-11-09T16:38:40Z

src/librustc_traits/type_op.rs

@@ -151,17 +151,35 @@ impl AscribeUserTypeCx<'me, 'gcx, 'tcx> {
        debug!("relate_type_and_user_type: ty of def-id is {:?}", ty);
        let ty = self.normalize(ty);

-        let mut projected_ty = PlaceTy::from_ty(ty);
+        // We need to follow any provided projetions into the type.


Suggested change

// We need to follow any provided projetions into the type.

// We need to follow any provided projections into the type.

bjorn3 · 2018-11-09T16:39:43Z

src/test/ui/borrowck/issue-55552-ascribe-wildcard-to-structured-pattern.rs

+
+// rust-lang/rust#55552: The strategy pnkfelix landed in PR #55274
+// (for ensuring that NLL respects user-provided lifetime annotations)
+// did not handle the case where the ascribed type has some expliit


Suggested change

// did not handle the case where the ascribed type has some expliit

// did not handle the case where the ascribed type has some explicit

bors · 2018-11-10T09:38:17Z

⌛ Testing commit 1bbaa55 with merge 4cd3294...

…rojections-out-of-a-ty-var, r=nikomatsakis Do not attempt to ascribe projections out of a ty var If we encounter `_` ascribed to structural pattern like `(a, b)`, just skip relate_types. Fix #55552

bors · 2018-11-10T12:21:52Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 4cd3294 to master...

@ghost

[beta] Rollup backports Merged and approved: * #55831: [beta]: Update Cargo's submodule * #55717: Bubble up an overflow error so that rustdoc can ignore it * #55637: Do not attempt to ascribe projections out of a ty var * #55378: rustbuild: use configured linker to build bootstrap r? @ghost

pnkfelix added 2 commits November 3, 2018 01:53

If we encounter _ ascribed to structural pattern like (a, b), jus…

09edfb8

…t skip relate_types.

Regression test for issue 55552.

1bbaa55

rust-highfive assigned varkor Nov 3, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 3, 2018

pnkfelix changed the title ~~Dont attempt to ascribe projections out of a ty var~~ Do not attempt to ascribe projections out of a ty var Nov 3, 2018

pnkfelix added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 3, 2018

rust-highfive assigned nikomatsakis and unassigned varkor Nov 3, 2018

nikomatsakis approved these changes Nov 6, 2018

View reviewed changes

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 Nov 6, 2018

pnkfelix mentioned this pull request Nov 7, 2018

NLL: investigate ascription when a _ wildcard tyvar is repeated #55748

Closed

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 8, 2018

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 Nov 9, 2018

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 9, 2018

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 9, 2018

bjorn3 reviewed Nov 9, 2018

View reviewed changes

bors merged commit 1bbaa55 into rust-lang:master Nov 10, 2018

pietroalbini mentioned this pull request Nov 10, 2018

[beta] Rollup backports #55849

Merged

pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 10, 2018

ehuss mentioned this pull request Jan 30, 2019

meta_test_multiple_versions_strategy is spuriously failing rust-lang/cargo#6613

Closed

	// We need to follow any provided projetions into the type.
	// We need to follow any provided projections into the type.

	// did not handle the case where the ascribed type has some expliit
	// did not handle the case where the ascribed type has some explicit

Do not attempt to ascribe projections out of a ty var #55637

Do not attempt to ascribe projections out of a ty var #55637

Uh oh!

Conversation

pnkfelix commented Nov 3, 2018

Uh oh!

rust-highfive commented Nov 3, 2018

Uh oh!

pnkfelix commented Nov 3, 2018

Uh oh!

nikomatsakis Nov 6, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Nov 6, 2018

Uh oh!

bors commented Nov 6, 2018

Uh oh!

nikomatsakis commented Nov 6, 2018

Uh oh!

pnkfelix commented Nov 8, 2018

Uh oh!

pietroalbini commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

pnkfelix commented Nov 9, 2018

Uh oh!

pnkfelix commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

pnkfelix commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

bors commented Nov 9, 2018

Uh oh!

pnkfelix commented Nov 9, 2018

Uh oh!

pnkfelix commented Nov 9, 2018

Uh oh!

bjorn3 left a comment

Choose a reason for hiding this comment

Uh oh!

bjorn3 Nov 9, 2018

Choose a reason for hiding this comment

Uh oh!

bjorn3 Nov 9, 2018

Choose a reason for hiding this comment

Uh oh!

bjorn3 Nov 9, 2018

Choose a reason for hiding this comment

Uh oh!

bors commented Nov 10, 2018

Uh oh!

bors commented Nov 10, 2018

Uh oh!

Uh oh!