[beta] Rollup backports - #54821

Merged

bors merged 3 commits into

rust-lang:betafrom

emilyalbini:beta-backports

Oct 5, 2018

Commits on Oct 4, 2018

resolve: Prefer `macro_rules` definitions to in-module macro definitions in some cases
petrochenkov
authored and
emilyalbini
committed
96eee8a
incr.comp.: Don't automatically enable -Zshare-generics for incr.comp. builds.
michaelwoerister
authored and
emilyalbini
committed
310a921
do not normalize non-scalar constants to a ConstValue::ScalarPair
RalfJung
authored and
emilyalbini
committed
e3f6931