diff options
| author | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-22 16:58:57 +0000 |
| commit | 5092c6b01acbff60935a5e6d84f83b6c73c1ca5e (patch) | |
| tree | bdc8568384c95b430e9bb324b82a876d98b1f56a /src/liballoc | |
| parent | b176285ba775f86301040fc624acb96b4499f562 (diff) | |
| parent | 2c6f911463efa6c2d87e5566fc1cd77a7d26509a (diff) | |
| download | rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.tar.gz rust-5092c6b01acbff60935a5e6d84f83b6c73c1ca5e.zip | |
Auto merge of #49264 - kennytm:rollup, r=kennytm
Rollup of 23 pull requests - Successful merges: #48374, #48596, #48759, #48939, #49029, #49069, #49093, #49109, #49117, #49140, #49158, #49188, #49189, #49209, #49211, #49216, #49225, #49231, #49234, #49242, #49244, #49105, #49038 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/tests/slice.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs index d9e9d91cea8..3f679d81f08 100644 --- a/src/liballoc/tests/slice.rs +++ b/src/liballoc/tests/slice.rs @@ -1351,7 +1351,7 @@ fn test_copy_from_slice_dst_shorter() { const MAX_LEN: usize = 80; static DROP_COUNTS: [AtomicUsize; MAX_LEN] = [ - // FIXME #5244: AtomicUsize is not Copy. + // FIXME(RFC 1109): AtomicUsize is not Copy. AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), |
