diff options
| author | bors <bors@rust-lang.org> | 2014-01-25 20:41:36 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-25 20:41:36 -0800 |
| commit | e36032e9e1aac2ca428f3e17b5524b6c8fe9418c (patch) | |
| tree | da9ec5aeebd1d26de74b540fbb0ce1de75b36e65 /src/libstd | |
| parent | e139b49eef62618f7894fde57a54b4d6642fbef8 (diff) | |
| parent | 0aef487a5c2797b34e64ddcfa3974264fbc9830b (diff) | |
| download | rust-e36032e9e1aac2ca428f3e17b5524b6c8fe9418c.tar.gz rust-e36032e9e1aac2ca428f3e17b5524b6c8fe9418c.zip | |
auto merge of #11808 : huonw/rust/std-visible-types, r=brson
These are either returned from public functions, and really should appear in the documentation, but don't since they're private, or are implementation details that are currently public.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/comm/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/comm/select.rs | 1 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/str.rs | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs index 1281f3d6a5c..dbffb6a0fd9 100644 --- a/src/libstd/comm/mod.rs +++ b/src/libstd/comm/mod.rs @@ -243,7 +243,7 @@ use vec::OwnedVector; use spsc = sync::spsc_queue; use mpsc = sync::mpsc_queue; -pub use self::select::Select; +pub use self::select::{Select, Handle}; macro_rules! test ( { fn $name:ident() $b:block $($a:attr)*} => ( diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index c9102a68435..fe3fc573788 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -89,6 +89,7 @@ pub struct Select { /// This handle is used to keep the port in the set as well as interact with the /// underlying port. pub struct Handle<'port, T> { + /// A unique ID for this Handle. id: uint, priv selector: &'port Select, priv port: &'port mut Port<T>, diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 027c4f18344..6141faa90da 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1268,7 +1268,7 @@ pub trait Acceptor<T> { /// The Some contains another Option representing whether the connection attempt was succesful. /// A successful connection will be wrapped in Some. /// A failed connection is represented as a None and raises a condition. -struct IncomingConnections<'a, A> { +pub struct IncomingConnections<'a, A> { priv inc: &'a mut A, } diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 22c9ae606d3..c7626105f51 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -620,7 +620,7 @@ enum NormalizationForm { /// External iterator for a string's normalization's characters. /// Use with the `std::iter` module. #[deriving(Clone)] -struct Normalizations<'a> { +pub struct Normalizations<'a> { priv kind: NormalizationForm, priv iter: Chars<'a>, priv buffer: ~[(char, u8)], |
