Skip to content

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 2, 2018

Backport of #54693, avoiding changing ConstValue to keep the churn down.

Fixes #54387

@rust-highfive
Copy link
Contributor

r? @estebank

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

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2018
@RalfJung RalfJung added beta-nominated Nominated for backporting to the compiler in the beta channel. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 2, 2018
@pietroalbini pietroalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Oct 2, 2018
@pnkfelix
Copy link
Contributor

pnkfelix commented Oct 4, 2018

discussed at compiler team meeting. Accepted for beta backport

@pnkfelix pnkfelix added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Oct 4, 2018
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2018
@pietroalbini
Copy link
Member

Rolled this up in #54821.

bors added a commit that referenced this pull request Oct 4, 2018
[beta] Rollup backports

Merged and approved:

* #54605: resolve: Disambiguate a subset of conflicts "macro_rules" vs "macro name in module"
* #54557: incr.comp.: Don't automatically enable -Zshare-generics for incr. comp. builds.
* #54759: do not normalize non-scalar constants to a ConstValue::ScalarPair

Closes #54759
r? @ghost
@pietroalbini
Copy link
Member

This was backported in #54821.

@RalfJung RalfJung deleted the ctfe-scalar-pair-undef branch November 30, 2018 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants