Lower constant patterns with ascribed types. by davidtwco · Pull Request #58161 · rust-lang/rust

davidtwco · 2019-02-04T18:18:05Z

This PR fixes a bug introduced by #55937 which started checking user
type annotations for associated type patterns. Where lowering a
associated constant expression would previously return a
PatternKind::Constant, it now returns a PatternKind::AscribeUserType
with a PatternKind::Constant inside, this PR unwraps that to
access the constant pattern inside and behaves as before.

r? @pnkfelix

arielb1 · 2019-02-06T15:22:43Z

r=me with comment in place

This commit fixes a bug introduced by rust-lang#55937 which started checking user type annotations for associated type patterns. Where lowering a associated constant expression would previously return a `PatternKind::Constant`, it now returns a `PatternKind::AscribeUserType` with a `PatternKind::Constant` inside, this commit unwraps that to access the constant pattern inside and behaves as before.

arielb1 · 2019-02-06T21:43:29Z

So @matthewjasper had complained that the AscribeUserType was getting dropped. Could you add it back, along with a mir-opt test?

r=me with that

arielb1 · 2019-02-08T12:24:48Z

It appears that fixing the AscribeUserType problem is more complicated than it appears at first glance - I have split it into #58299 - but we need to fix this PR for beta.

@bors r+ p=1

bors · 2019-02-08T12:24:49Z

📌 Commit 6717727 has been approved by arielb1

arielb1 · 2019-02-08T12:25:13Z

beta-nominating because this fixes a regression in beta.

bors · 2019-02-08T13:34:19Z

⌛ Testing commit 6717727 with merge 7fcc7a28ebc267130f91107187c3073658f8482e...

bors · 2019-02-08T14:16:11Z

💔 Test failed - checks-travis

rust-highfive · 2019-02-08T14:16:12Z

The job dist-x86_64-apple of your PR failed on Travis (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.

[00:01:34] Compiling serde_derive v1.0.81
[00:01:37] Compiling toml v0.4.10
[00:01:37] Compiling serde_json v1.0.33
[00:01:47] Compiling bootstrap v0.0.0 (/Users/travis/build/rust-lang/rust/src/bootstrap)
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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)

arielb1 · 2019-02-08T14:23:01Z

No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

@bors retry

arielb1 · 2019-02-08T14:23:10Z

cc @kennytm looks spurious

@pnkfelix

Lower constant patterns with ascribed types. Fixes#57960. This PR fixes a bug introduced by #55937 which started checking user type annotations for associated type patterns. Where lowering a associated constant expression would previously return a `PatternKind::Constant`, it now returns a `PatternKind::AscribeUserType` with a `PatternKind::Constant` inside, this PR unwraps that to access the constant pattern inside and behaves as before. r? @pnkfelix

bors · 2019-02-08T17:14:04Z

⌛ Testing commit 6717727 with merge a2ec156...

bors · 2019-02-08T19:49:36Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: arielb1
Pushing a2ec156 to master...

This commit builds on the fix from rust-lang#58161 (which fixed miscompilation caused by the introduction of `AscribeUserType` patterns for associated constants) to start checking these patterns are well-formed for ranges (previous fix just ignored them so that miscompilation wouldn't occur).

@arielb1

Check user type annotations for range patterns. Fixesrust-lang#58299. This PR builds on the fix from rust-lang#58161 (which fixed miscompilation caused by the introduction of `AscribeUserType` patterns for associated constants) to start checking these patterns are well-formed for ranges (previous fix just ignored them so that miscompilation wouldn't occur). r? @arielb1

pnkfelix · 2019-02-14T15:10:37Z

triage, beta-accepted.

@ghost

[beta] Rollup backports Cherry-picked: * #58207: Make `intern_lazy_const` actually intern its argument. * #58161: Lower constant patterns with ascribed types. * #57908: resolve: Fix span arithmetics in the import conflict error * #57835: typeck: remove leaky nested probe during trait object method resolution * #57885: Avoid committing to autoderef in object method probing * #57646: Fixes text becoming invisible when element targetted Rolled up: * #58522: [BETA] Update cargo r? @ghost

@ghost

[beta] Rollup backports Cherry-picked: * #58207: Make `intern_lazy_const` actually intern its argument. * #58161: Lower constant patterns with ascribed types. * #57908: resolve: Fix span arithmetics in the import conflict error * #57835: typeck: remove leaky nested probe during trait object method resolution * #57885: Avoid committing to autoderef in object method probing * #57646: Fixes text becoming invisible when element targetted Rolled up: * #58522: [BETA] Update cargo r? @ghost

rust-highfive assigned pnkfelix Feb 4, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 4, 2019

davidtwco mentioned this pull request Feb 4, 2019
Associated-const ranges in patterns are miscompiled in beta #57960
Closed

arielb1 reviewed Feb 6, 2019
View reviewed changes

Comment threadsrc/librustc_mir/hair/pattern/mod.rs Outdated

arielb1 reviewed Feb 6, 2019
View reviewed changes

Comment threadsrc/librustc_mir/hair/pattern/mod.rs Outdated

davidtwco force-pushed the issue-57960 branch from 789112f to 6717727Compare February 6, 2019 20:10

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 Feb 8, 2019

arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 8, 2019

arielb1 added I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 8, 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 Feb 8, 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 Feb 8, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2019

bors merged commit 6717727 into rust-lang:masterFeb 8, 2019

davidtwco deleted the issue-57960 branch February 10, 2019 11:23

davidtwco mentioned this pull request Feb 11, 2019
Check user type annotations for range patterns. #58371
Merged

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 14, 2019

emilyalbini mentioned this pull request Feb 17, 2019
[beta] Rollup backports #58537
Merged

emilyalbini removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Feb 17, 2019

kennytm mentioned this pull request Feb 22, 2019
Spurious 30 minutes timeout on Travis CI #56112
Closed

Uh oh!

Uh oh!

Conversation

davidtwco commented Feb 4, 2019

Uh oh!

Uh oh!

arielb1 commented Feb 6, 2019

Uh oh!

Uh oh!

arielb1 commented Feb 6, 2019

Uh oh!

arielb1 commented Feb 8, 2019

Uh oh!

bors commented Feb 8, 2019

Uh oh!

arielb1 commented Feb 8, 2019

Uh oh!

bors commented Feb 8, 2019

Uh oh!

bors commented Feb 8, 2019

Uh oh!

rust-highfive commented Feb 8, 2019

Uh oh!

arielb1 commented Feb 8, 2019

Uh oh!

arielb1 commented Feb 8, 2019

Uh oh!

bors commented Feb 8, 2019

Uh oh!

bors commented Feb 8, 2019

Uh oh!

pnkfelix commented Feb 14, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants