nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-04 20:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

std::comm: replace Handle.id with a method.

Browse Source 
The `id` shouldn't be changed by external code, and exposing it publicly
allows to be accidentally changed.

Also, remove the first element special case in the `select!` macro.
This commit is contained in:
Huon Wilson 2014-02-13 14:10:29 +11:00 committed by Alex Crichton
parent 866d6cc33d
commit 411a01feb3
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libstd/comm/select.rs
View File

@ -60,21 +60,17 @@ use uint;
macro_rules! select { macro_rules! select {
( (
$name1:pat = $port1:ident.$meth1:ident() => $code1:expr, $($name:pat = $port:ident.$meth:ident() => $code:expr),+
$($name:pat = $port:ident.$meth:ident() => $code:expr),*
) => ({ ) => ({
use std::comm::Select; use std::comm::Select;
let sel = Select::new(); let sel = Select::new();
let mut $port1 = sel.handle(&$port1); $( let mut $port = sel.handle(&$port); )+
$( let mut $port = sel.handle(&$port); )*
unsafe { unsafe {
$port1.add(); $( $port.add(); )+
$( $port.add(); )*
} }
let ret = sel.wait(); let ret = sel.wait();
if ret == $port1.id { let $name1 = $port1.$meth1(); $code1 } $( if ret == $port.id() { let $name = $port.$meth(); $code } else )+
$( else if ret == $port.id { let $name = $port.$meth(); $code } )* { unreachable!() }
else { unreachable!() }
}) })
} }
@ -94,7 +90,7 @@ pub struct Select {
pub struct Handle<'port, T> { pub struct Handle<'port, T> {
/// The ID of this handle, used to compare against the return value of /// The ID of this handle, used to compare against the return value of
/// `Select::wait()` /// `Select::wait()`
id: uint, priv id: uint,
priv selector: &'port Select, priv selector: &'port Select,
priv next: *mut Handle<'static, ()>, priv next: *mut Handle<'static, ()>,
priv prev: *mut Handle<'static, ()>, priv prev: *mut Handle<'static, ()>,
@ -150,7 +146,7 @@ impl Select {
/// Waits for an event on this port set. The returned valus is *not* and /// Waits for an event on this port set. The returned valus is *not* and
/// index, but rather an id. This id can be queried against any active /// index, but rather an id. This id can be queried against any active
/// `Handle` structures (each one has a public `id` field). The handle with /// `Handle` structures (each one has an `id` method). The handle with
/// the matching `id` will have some sort of event available on it. The /// the matching `id` will have some sort of event available on it. The
/// event could either be that data is available or the corresponding /// event could either be that data is available or the corresponding
/// channel has been closed. /// channel has been closed.
@ -242,6 +238,10 @@ impl Select {
} }
impl<'port, T: Send> Handle<'port, T> { impl<'port, T: Send> Handle<'port, T> {
/// Retrieve the id of this handle.
#[inline]
pub fn id(&self) -> uint { self.id }
/// Receive a value on the underlying port. Has the same semantics as /// Receive a value on the underlying port. Has the same semantics as
/// `Port.recv` /// `Port.recv`
pub fn recv(&mut self) -> T { self.port.recv() } pub fn recv(&mut self) -> T { self.port.recv() }
@ -355,7 +355,7 @@ mod test {
) )
drop(c2); drop(c2);
select! ( select! (
bar = p2.recv_opt() => { assert_eq!(bar, None); }, bar = p2.recv_opt() => { assert_eq!(bar, None); }
) )
}) })