about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src/allocator.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-26 07:10:44 +0000
committerbors <bors@rust-lang.org>2021-05-26 07:10:44 +0000
commit1969c2e312303faa458cf19dad9783165e3c72c8 (patch)
tree1f31c97a13f474a8f383e86360a1b8d2aa3468b4 /compiler/rustc_codegen_llvm/src/allocator.rs
parent54bdfa125722c9ee6fadb61818f861b1102fd300 (diff)
parent7c0677ad9b2843eec8ad5330ac7cf29935ec3a22 (diff)
downloadrust-1969c2e312303faa458cf19dad9783165e3c72c8.tar.gz
rust-1969c2e312303faa458cf19dad9783165e3c72c8.zip
Auto merge of #85711 - JohnTitor:rollup-8why04t, r=JohnTitor
Rollup of 12 pull requests

Successful merges:

 - #84048 (Avoid CJK legacy fonts in Windows)
 - #85529 (doc: clarify Mutex::try_lock, etc. errors)
 - #85590 (Fix bootstrap using host exe suffix for cargo)
 - #85610 (Fix pointer provenance in <[T]>::copy_within)
 - #85623 (Remove stray .stderr files)
 - #85645 (Demote `ControlFlow::{from|into}_try` to `pub(crate)`)
 - #85647 (Revert "Move llvm submodule updates to rustbuild")
 - #85666 (Document shared_from_cow functions)
 - #85668 (Fix tasklist example in rustdoc book.)
 - #85672 (Move stability attribute for items under the `ip` feature)
 - #85699 (Update books)
 - #85701 (Update cargo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/allocator.rs')
0 files changed, 0 insertions, 0 deletions