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

Const prop refactoring #60457

Merged
merged 2 commits into from
May 3, 2019
Merged

Conversation

wesleywiser
Copy link
Member

This is rebased on top of #60428 so only the top commit is new.

This is the refactoring to remove the mir field from ConstPropagator which is necessary before we can begin to actually propagate constants.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2019
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

r=me with nit fixed, rebased and CI passing

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented May 2, 2019

You need an additional //~| ERROR erroneous constant below

black_box((FOO, FOO));
//~^ ERROR erroneous constant used

@oli-obk
Copy link
Contributor

oli-obk commented May 2, 2019

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2019

📌 Commit cac07eb has been approved by oli-obk

@bors 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 May 2, 2019
Centril added a commit to Centril/rust that referenced this pull request May 2, 2019
… r=oli-obk

Const prop refactoring

This is rebased on top of rust-lang#60428 so only the top commit is new.

This is the refactoring to remove the `mir` field from `ConstPropagator` which is necessary before we can begin to actually propagate constants.

r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request May 3, 2019
… r=oli-obk

Const prop refactoring

This is rebased on top of rust-lang#60428 so only the top commit is new.

This is the refactoring to remove the `mir` field from `ConstPropagator` which is necessary before we can begin to actually propagate constants.

r? @oli-obk
bors added a commit that referenced this pull request May 3, 2019
Rollup of 12 pull requests

Successful merges:

 - #59928 (Make deprecation lint `ambiguous_associated_items` deny-by-default)
 - #60220 (report fatal errors during doctest parsing)
 - #60373 (Tidy: ensure lang features are sorted by since)
 - #60388 (Disallow non-explicit elided lifetimes in async fn)
 - #60393 ( Do not suggest incorrect syntax on pattern type error due to borrow)
 - #60401 (Rename `RUST_LOG` to `RUSTC_LOG`)
 - #60409 (Require a trait in the bounds of existential types)
 - #60455 (Resolve match arm ty when arms diverge)
 - #60457 (Const prop refactoring)
 - #60467 (Avoid repeated interning of static strings.)
 - #60478 (minor compiler doc tweaks)
 - #60501 (Propagate mutability from arguments to local bindings in async fn)

Failed merges:

r? @ghost
@bors bors merged commit cac07eb into rust-lang:master May 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants