about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-17 10:03:02 +0000
committerbors <bors@rust-lang.org>2019-04-17 10:03:02 +0000
commitefe2f32a6b8217425f361ec7c206910c611c03ee (patch)
tree8976b59372367993066cd5d3bdd70f8b50e7aa81 /src/rustllvm/RustWrapper.cpp
parente4e032a0ae82d7db4f99872ff98626af2941c4a5 (diff)
parenteb958e1b2e498f4751ac7c36cb2aeb4ce2ab68a0 (diff)
downloadrust-efe2f32a6b8217425f361ec7c206910c611c03ee.tar.gz
rust-efe2f32a6b8217425f361ec7c206910c611c03ee.zip
Auto merge of #60030 - Centril:rollup-3d0t24t, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #59128 (Emit ansi color codes in the `rendered` field of json diagnostics)
 - #59646 (const fn: Improve wording)
 - #59986 (Miri: refactor new allocation tagging)
 - #60003 (LLD is not supported on Darwin)
 - #60018 (Miri now supports entropy, but is still slow)

Failed merges:

r? @ghost
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions