/rust

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

Deduplicate literal -> constant lowering #56312

Merged
merged 2 commits into from Nov 29, 2018

Conversation

Reviewers

@eddyb eddyb

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
5 participants
@oli-obk @rust-highfive @eddyb @bors @nikomatsakis
@oli-obk
Contributor

oli-obk commented Nov 28, 2018

No description provided.

@rust-highfive rust-highfive assigned eddyb Nov 28, 2018

@rust-highfive

This comment has been minimized.

Sign in to view
Collaborator

rust-highfive commented Nov 28, 2018

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review label Nov 28, 2018

@eddyb

eddyb reviewed Nov 28, 2018
View changes

src/librustc_mir/hair/pattern/mod.rs Outdated
tcx: TyCtxt<'a, 'gcx, 'tcx>,
ty: Ty<'tcx>,
neg: bool,
) -> Result<&'tcx ty::Const<'tcx>, LitToConstError> {

This comment has been minimized.

Sign in to view
Copy link
@eddyb

eddyb Nov 28, 2018

Member

Can this be moved out of hair::pattern? Somewhere else in hair would be fine (cc @nikomatsakis).

This comment has been minimized.

Sign in to view
Copy link
@oli-obk

oli-obk Nov 28, 2018

Contributor

I created a custom file, there's likely other things we'll want to add in the future.
@eddyb

This comment has been minimized.

Sign in to view
Member

eddyb commented Nov 28, 2018

@bors r+
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Nov 28, 2018

📌 Commit afb8cba has been approved by eddyb

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Nov 28, 2018

@eddyb

This comment has been minimized.

Sign in to view
Member

eddyb commented Nov 28, 2018

Ehm I think I wanted to say this (but it's not that big of a deal):

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Nov 28, 2018

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 29, 2018

@GuillaumeGomez
Rollup merge of rust-lang#56312 - oli-obk:const_eval_literal, r=eddyb 
Deduplicate literal -> constant lowering
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
9a5725c

@GuillaumeGomez GuillaumeGomez referenced this pull request Nov 29, 2018

Merged

Rollup of 22 pull requests #56340

bors added a commit that referenced this pull request Nov 29, 2018

@bors
Auto merge of #56340 - GuillaumeGomez:rollup, r=GuillaumeGomez 
Rollup of 22 pull requests

Successful merges:

 - #55391 (bootstrap: clean up a few clippy findings)
 - #56021 (avoid features_untracked)
 - #56023 (atomic::Ordering: Get rid of misleading parts of intro)
 - #56080 (Reduce the amount of bold text at doc.rlo)
 - #56114 (Enclose type in backticks for "non-exhaustive patterns" error)
 - #56124 (Fix small doc mistake on std::io::read::read_to_end)
 - #56127 (Update an outdated comment in mir building)
 - #56148 (Add rustc-guide as a submodule)
 - #56149 (Make std::os::unix/linux::fs::MetadataExt::a/m/ctime* documentation clearer)
 - #56220 (Suggest appropriate place for lifetime when declared after type arguments)
 - #56223 (Make JSON output from -Zprofile-json valid)
 - #56236 (Remove unsafe `unsafe` inner function.)
 - #56255 (Update outdated code comments in StringReader)
 - #56257 (rustc-guide has moved to rust-lang/)
 - #56273 (Add missing doc link)
 - #56289 (Fix small typo in comment of thread::stack_size)
 - #56294 (Fix a typo in the documentation of std::ffi)
 - #56312 (Deduplicate literal -> constant lowering)
 - #56319 (fix futures creating aliasing mutable and shared ref)
 - #56321 (rustdoc: add bottom margin spacing to nested lists)
 - #56322 (resolve: Fix false-positives from lint `absolute_paths_not_starting_with_crate`)
 - #56330 (Clean up span in non-trailing `..` suggestion)

Failed merges:

r? @ghost
Loading status checks…
0c1dc62

@bors bors merged commit afb8cba into rust-lang:master Nov 29, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment