Skip to content

NLL: cast causes failure to promote to static - #55385

Merged
bors merged 3 commits into
rust-lang:masterfrom
davidtwco:issue-55288
Oct 27, 2018
Merged

NLL: cast causes failure to promote to static #55385
bors merged 3 commits into
rust-lang:masterfrom
davidtwco:issue-55288

Conversation

@davidtwco

@davidtwcodavidtwco commented Oct 26, 2018

Copy link
Copy Markdown
Member

Fixes#55288. See commit messages for more details.

r? @oli-obk
cc @nikomatsakis
cc @pnkfelix
cc @RalfJung

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2018
RalfJung
RalfJung reviewed Oct 26, 2018
View reviewed changes
Comment threadsrc/librustc/mir/visit.rs Outdated
RalfJung
RalfJung requested changes Oct 26, 2018
View reviewed changes
Comment threadsrc/librustc/mir/visit.rs Outdated

@RalfJungRalfJungOct 26, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this used for? It's a new classification, isn't it?

@davidtwcodavidtwcoOct 26, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this function from another pass that I stumbled upon while making changes, it was used in a handful of places and was being imported from that pass.

Comment threadsrc/librustc/mir/visit.rs Outdated
Comment threadsrc/librustc/mir/visit.rs Outdated

@RalfJungRalfJungOct 26, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not nice... now we have a mixture of type-based classification and dynamic classification, not getting the benefits of either of them.

Given this, I don't think it makes any sense to separate the enum into 4.

@davidtwcodavidtwcoOct 26, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've modified this to remove the fourth variant. It's still not ideal, because there are now three borrow variants, but I think it is cleaner than with four variants.

oli-obk
oli-obk requested changes Oct 26, 2018
View reviewed changes
Comment threadsrc/librustc/mir/visit.rs Outdated
Comment threadsrc/librustc/mir/visit.rs Outdated
Comment threadsrc/librustc_codegen_llvm/mir/analyze.rs Outdated
Comment threadsrc/librustc_mir/transform/const_prop.rs Outdated
Comment threadsrc/librustc_mir/transform/simplify.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@oli-obk

oli-obk commented Oct 26, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

@bors r+ 🏎️

@bors

bors commented Oct 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit dcaf3fd2f7b45ca4cf80aaa3be312b6b886e9c33 has been approved by oli-obk

@borsbors 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 Oct 26, 2018
@nikomatsakis

nikomatsakis commented Oct 26, 2018

Copy link
Copy Markdown
Contributor

@bors p=1

This is an RC2 "nice to have"

@pnkfelixpnkfelix mentioned this pull request Oct 26, 2018
Merged
@bors

This comment has been minimized.

Sign in to view
@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2018
@bors

This comment has been minimized.

Sign in to view
@oli-obkoli-obk mentioned this pull request Oct 26, 2018
Closed
@davidtwco

davidtwco commented Oct 26, 2018

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented Oct 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 6b33189b7f7d07544563b92a55edce0240327fa4 has been approved by oli-obk

@borsbors 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 Oct 26, 2018
@bors

This comment has been minimized.

Sign in to view
@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 27, 2018
@bors

This comment has been minimized.

Sign in to view
@davidtwco
Add helpful logging statements.
9169f81
This commit adds logging statements to `promote_consts` and
`qualify_consts` to make it easier to understand what it is doing.
@davidtwco

davidtwco commented Oct 27, 2018

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented Oct 27, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 6208bd8 has been approved by oli-obk

@borsbors 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 Oct 27, 2018
@pnkfelix

pnkfelix commented Oct 27, 2018

Copy link
Copy Markdown
Contributor

@bors p=1

As mentioned above, this is nice to have for RC2, so we are trying to win the race to get it in before beta cutoff

@bors

bors commented Oct 27, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6208bd8 with merge a47da3a38c1ffaa0805525fc5e1a0a92b4216303...

@bors

This comment has been minimized.

Sign in to view
@borsbors 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 Oct 27, 2018
@davidtwco

davidtwco commented Oct 27, 2018

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 Oct 27, 2018
@oli-obk

oli-obk commented Oct 27, 2018

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Oct 27, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6208bd8 with merge b3b8760...

bors added a commit that referenced this pull request Oct 27, 2018
@bors
Auto merge of#55385- davidtwco:issue-55288, r=oli-obk
b3b8760
NLL: cast causes failure to promote to static
Fixes#55288. See commit messages for more details.
r? @oli-obk
cc @nikomatsakis
cc @pnkfelix
cc @RalfJung
@bors

bors commented Oct 27, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing b3b8760 to master...

@bors
bors merged commit 6208bd8 into rust-lang:masterOct 27, 2018
@borsbors mentioned this pull request Oct 27, 2018
Merged
@davidtwco
davidtwco deleted the issue-55288 branch October 27, 2018 20:10
@emilyalbini

emilyalbini commented Nov 19, 2018

Copy link
Copy Markdown
Member

Nominating for beta backport, since this fixes a beta regression.

cc @rust-lang/compiler

@emilyalbiniemilyalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 19, 2018
@emilyalbiniemilyalbini mentioned this pull request Nov 19, 2018
Closed
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@alexcrichtonalexcrichton added this to the Rust 2018 Release milestone Nov 19, 2018
@emilyalbiniemilyalbini mentioned this pull request Nov 20, 2018
Closed
@nikomatsakisnikomatsakis mentioned this pull request Nov 20, 2018
Merged
20 tasks
bors added a commit that referenced this pull request Nov 20, 2018
@bors
Auto merge of#56102- nikomatsakis:beta, r=alexcrichton
4b3a1d9
beta backport rollup
Backports of some beta-approved PRs
- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x] Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x] Adjust Ids of path segments in visibility modifiers #55487
- [x] save-analysis: bug fix and optimisation. #55521
- [x] save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x] save-analysis: fallback to using path id #56060
- [x] save-analysis: Don't panic for macro-generated use globs #55879
- [x] Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601#56049
- [x] Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x] Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x] Stabilize `extern_crate_item_prelude` #56032
Still running tests locally, and I plan to backport @nrc's other PRs too
(cc @petrochenkov -- thanks for the advice)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung requested changes
@oli-obkoli-obkoli-obk approved these changes

Assignees

@oli-obkoli-obk

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

Rust 2018 Release

Development

Successfully merging this pull request may close these issues.

9 participants

@davidtwco@rust-highfive@oli-obk@bors@nikomatsakis@pnkfelix@emilyalbini@RalfJung@alexcrichton