Skip to content

Commit 48bc291

Browse files
committed
silence various warnings in stdlib, no idea why they suddenly started
1 parent a2b9562 commit 48bc291

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/liballoc/heap.rs

-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ mod imp {
255255
#[cfg(not(jemalloc), unix)]
256256
mod imp {
257257
use core::cmp;
258-
use core::mem;
259258
use core::ptr;
260259
use libc;
261260
use libc_heap;

src/libsync/comm/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ pub struct Receiver<T> {
379379
inner: UnsafeCell<Flavor<T>>,
380380
receives: Cell<uint>,
381381
// can't share in an arc
382-
marker: marker::NoSync,
382+
_marker: marker::NoSync,
383383
}
384384

385385
/// An iterator over messages on a receiver, this iterator will block
@@ -397,7 +397,7 @@ pub struct Sender<T> {
397397
inner: UnsafeCell<Flavor<T>>,
398398
sends: Cell<uint>,
399399
// can't share in an arc
400-
marker: marker::NoSync,
400+
_marker: marker::NoSync,
401401
}
402402

403403
/// The sending-half of Rust's synchronous channel type. This half can only be
@@ -406,7 +406,7 @@ pub struct Sender<T> {
406406
pub struct SyncSender<T> {
407407
inner: Arc<UnsafeCell<sync::Packet<T>>>,
408408
// can't share in an arc
409-
marker: marker::NoSync,
409+
_marker: marker::NoSync,
410410
}
411411

412412
/// This enumeration is the list of the possible reasons that try_recv could not
@@ -543,7 +543,7 @@ impl<T: Send> Sender<T> {
543543
Sender {
544544
inner: UnsafeCell::new(inner),
545545
sends: Cell::new(0),
546-
marker: marker::NoSync,
546+
_marker: marker::NoSync,
547547
}
548548
}
549549

@@ -719,7 +719,7 @@ impl<T: Send> Drop for Sender<T> {
719719

720720
impl<T: Send> SyncSender<T> {
721721
fn new(inner: Arc<UnsafeCell<sync::Packet<T>>>) -> SyncSender<T> {
722-
SyncSender { inner: inner, marker: marker::NoSync }
722+
SyncSender { inner: inner, _marker: marker::NoSync }
723723
}
724724

725725
/// Sends a value on this synchronous channel.
@@ -807,7 +807,7 @@ impl<T: Send> Drop for SyncSender<T> {
807807

808808
impl<T: Send> Receiver<T> {
809809
fn new(inner: Flavor<T>) -> Receiver<T> {
810-
Receiver { inner: UnsafeCell::new(inner), receives: Cell::new(0), marker: marker::NoSync }
810+
Receiver { inner: UnsafeCell::new(inner), receives: Cell::new(0), _marker: marker::NoSync }
811811
}
812812

813813
/// Blocks waiting for a value on this receiver

src/libsync/deque.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ struct Deque<T> {
8787
/// There may only be one worker per deque.
8888
pub struct Worker<T> {
8989
deque: Arc<Deque<T>>,
90-
noshare: marker::NoSync,
90+
_noshare: marker::NoSync,
9191
}
9292

9393
/// The stealing half of the work-stealing deque. Stealers have access to the
9494
/// opposite end of the deque from the worker, and they only have access to the
9595
/// `steal` method.
9696
pub struct Stealer<T> {
9797
deque: Arc<Deque<T>>,
98-
noshare: marker::NoSync,
98+
_noshare: marker::NoSync,
9999
}
100100

101101
/// When stealing some data, this is an enumeration of the possible outcomes.
@@ -153,8 +153,8 @@ impl<T: Send> BufferPool<T> {
153153
pub fn deque(&self) -> (Worker<T>, Stealer<T>) {
154154
let a = Arc::new(Deque::new(self.clone()));
155155
let b = a.clone();
156-
(Worker { deque: a, noshare: marker::NoSync },
157-
Stealer { deque: b, noshare: marker::NoSync })
156+
(Worker { deque: a, _noshare: marker::NoSync },
157+
Stealer { deque: b, _noshare: marker::NoSync })
158158
}
159159

160160
fn alloc(&mut self, bits: uint) -> Box<Buffer<T>> {
@@ -217,7 +217,7 @@ impl<T: Send> Stealer<T> {
217217

218218
impl<T: Send> Clone for Stealer<T> {
219219
fn clone(&self) -> Stealer<T> {
220-
Stealer { deque: self.deque.clone(), noshare: marker::NoSync }
220+
Stealer { deque: self.deque.clone(), _noshare: marker::NoSync }
221221
}
222222
}
223223

0 commit comments

Comments
 (0)