about summary refs log tree commit diff
path: root/src/libstd/sys/unix/stack_overflow.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-29 14:48:58 +0000
committerbors <bors@rust-lang.org>2020-03-29 14:48:58 +0000
commit285519d412ef9c65df3bcd2de2b1a3d6ca16a255 (patch)
tree27bae9b4daff1595d72f320e89353f4aa817391c /src/libstd/sys/unix/stack_overflow.rs
parent8ab82b87af4f20b6c0a481e050517103d50263e9 (diff)
parentb851591731ef4e8017672e1e94ea55a44396d593 (diff)
downloadrust-285519d412ef9c65df3bcd2de2b1a3d6ca16a255.tar.gz
rust-285519d412ef9c65df3bcd2de2b1a3d6ca16a255.zip
Auto merge of #70534 - Centril:rollup-t59tcx2, r=Centril
Rollup of 3 pull requests

Successful merges:

 - #70140 (Add Result<Result<T, E>, E>::flatten -> Result<T, E>)
 - #70526 (reduce `rustc_attr` usage in places)
 - #70527 (Update LLVM submodule)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions