diff options
| author | bors <bors@rust-lang.org> | 2014-03-28 17:16:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-28 17:16:48 -0700 |
| commit | ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c (patch) | |
| tree | f398acb54f2432247f3c174555010b3055cd7133 /src/libstd/sync | |
| parent | cbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2 (diff) | |
| parent | 451e8c1c6178750a4c1789f40749562164a980b7 (diff) | |
| download | rust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.tar.gz rust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.zip | |
auto merge of #13162 : alexcrichton/rust/attr-syntax, r=brson
This is the rebasing of #13068 with a fix for #13067 as the first commit.
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/atomics.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpmc_bounded_queue.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/atomics.rs b/src/libstd/sync/atomics.rs index bca7cf25944..6cc2f85bd95 100644 --- a/src/libstd/sync/atomics.rs +++ b/src/libstd/sync/atomics.rs @@ -105,7 +105,7 @@ //! } //! ``` -#[allow(missing_doc)]; +#![allow(missing_doc)] use intrinsics; use cast; diff --git a/src/libstd/sync/mpmc_bounded_queue.rs b/src/libstd/sync/mpmc_bounded_queue.rs index 95f592baff0..dfa962cdb80 100644 --- a/src/libstd/sync/mpmc_bounded_queue.rs +++ b/src/libstd/sync/mpmc_bounded_queue.rs @@ -25,7 +25,7 @@ * policies, either expressed or implied, of Dmitry Vyukov. */ -#[allow(missing_doc, dead_code)]; +#![allow(missing_doc, dead_code)] // http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue |