diff options
| author | bors <bors@rust-lang.org> | 2018-10-04 23:17:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-04 23:17:31 +0000 |
| commit | 96a22982442d9ae2a501cdc97a0a10e256097fb2 (patch) | |
| tree | 4b859fca4962ca2e1d17ba46df96dc6cd4a74625 /src/libsyntax | |
| parent | f11dae2b276c77acf8b46b652ac6af12c8543a19 (diff) | |
| parent | e3f69317a0aab547ec98b5db93130cc69f52e20d (diff) | |
Auto merge of #54821 - pietroalbini:beta-backports, r=pietroalbini
[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
Diffstat (limited to 'src/libsyntax')
0 files changed, 0 insertions, 0 deletions