about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-08 15:54:09 +0000
committerbors <bors@rust-lang.org>2020-03-08 15:54:09 +0000
commit564758c4c329e89722454dd2fbb35f1ac0b8b47c (patch)
treea4418e2d169ea63280e3c6cc634912d503332274 /src/rustllvm/RustWrapper.cpp
parent1d5241c96208ca7d925442b1a5fa45ad18717a6f (diff)
parent06689e212fbd95558c778ce753208223276bcac9 (diff)
downloadrust-564758c4c329e89722454dd2fbb35f1ac0b8b47c.tar.gz
rust-564758c4c329e89722454dd2fbb35f1ac0b8b47c.zip
Auto merge of #69829 - Centril:rollup-lm5lzsq, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #69631 (remove non-sysroot sources from rust-src component)
 - #69646 (Miri visitor: detect primitive types based on type, not layout (also, more tests))
 - #69651 (Try to ensure usize marker does not get merged)
 - #69668 (More documentation and simplification of BTreeMap's internals)
 - #69771 (Cleanup E0390 explanation)
 - #69777 (Add missing ` in doc for File::with_options())
 - #69812 (Refactorings to method/probe.rs and CrateId)

Failed merges:

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