Code

[beta] Rollup backports#54821

Code

Merged

bors merged 3 commits intorust-lang:betarust-lang/rust:betafrom

pietroalbini:beta-backportspietroalbini/rust:beta-backportsCopy head branch name to clipboard

Oct 5, 2018

Commits

Commits on Oct 4, 2018

• resolve: Prefer `macro_rules` definitions to in-module macro definitions in some cases

  

  petrochenkov

  authored and

  pietroalbini

  committed
  96eee8a

  Copy full SHA for 96eee8a

• incr.comp.: Don't automatically enable -Zshare-generics for incr.comp. builds.

  

  michaelwoerister

  authored and

  pietroalbini

  committed
  310a921

  Copy full SHA for 310a921

• do not normalize non-scalar constants to a ConstValue::ScalarPair

  

  RalfJung

  authored and

  pietroalbini

  committed
  e3f6931

  Copy full SHA for e3f6931