about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-20 17:33:58 +0000
committerbors <bors@rust-lang.org>2017-04-20 17:33:58 +0000
commitddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61 (patch)
tree094738d887f663dcad286b3d9b16804ff4a7afbc /src/libstd/sync
parent968ae7babecfc6c62ef9699ff052d9ab00411848 (diff)
parent9d918223a8c741e153cd3cf373a5920f7ea0dadc (diff)
downloadrust-ddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61.tar.gz
rust-ddc5d7bd4b9ea3e8a8ccf82cb443e950be311d61.zip
Auto merge of #41424 - frewsxcv:rollup, r=frewsxcv
Rollup of 2 pull requests

- Successful merges: #40812, #40987
- Failed merges:
Diffstat (limited to 'src/libstd/sync')
0 files changed, 0 insertions, 0 deletions