Skip to content

std,extra: Make some types public and others private #11808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/libextra/btree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
///number of elements that a given node can contain.
#[allow(missing_doc)]
pub struct BTree<K, V> {
root: Node<K, V>,
len: uint,
lower_bound: uint,
upper_bound: uint
priv root: Node<K, V>,
priv len: uint,
priv lower_bound: uint,
priv upper_bound: uint
}

//We would probably want to remove the dependence on the Clone trait in the future.
Expand All @@ -47,9 +47,9 @@ impl<K: TotalOrd, V> BTree<K, V> {

///Helper function for clone: returns new BTree with supplied root node,
///length, and lower bound. For use when the length is known already.
pub fn new_with_node_len(n: Node<K, V>,
length: uint,
lb: uint) -> BTree<K, V> {
fn new_with_node_len(n: Node<K, V>,
length: uint,
lb: uint) -> BTree<K, V> {
BTree {
root: n,
len: length,
Expand Down Expand Up @@ -590,4 +590,3 @@ mod test_btree {
}

}

6 changes: 4 additions & 2 deletions src/libextra/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ pub struct TestOpts {
logfile: Option<Path>
}

type OptRes = Result<TestOpts, ~str>;
/// Result of parsing the options.
pub type OptRes = Result<TestOpts, ~str>;

fn optgroups() -> ~[getopts::groups::OptGroup] {
~[groups::optflag("", "ignored", "Run ignored tests"),
Expand Down Expand Up @@ -722,7 +723,8 @@ enum TestEvent {
TeResult(TestDesc, TestResult),
}

type MonitorMsg = (TestDesc, TestResult);
/// The message sent to the test monitor from the individual runners.
pub type MonitorMsg = (TestDesc, TestResult);

fn run_tests(opts: &TestOpts,
tests: ~[TestDescAndFn],
Expand Down
2 changes: 1 addition & 1 deletion src/libnative/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub mod timer;

mod timer_helper;

type IoResult<T> = Result<T, IoError>;
pub type IoResult<T> = Result<T, IoError>;

fn unimpl() -> IoError {
IoError {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/comm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)*} => (
Expand Down
1 change: 1 addition & 0 deletions src/libstd/comm/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)],
Expand Down