summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-10 06:39:31 +0000
committerbors <bors@rust-lang.org>2015-02-10 06:39:31 +0000
commit29ff00cc97e67ed6aec16aa6c30e152d6065e952 (patch)
tree1f89caba590360ce2338cb0a777606e702c129a1 /src
parent0bfe358e0fe3b35f0434e81e7c53ea844e95cc13 (diff)
parentf77dd70d6138d62c261015142d57cd39982f9fe6 (diff)
downloadrust-29ff00cc97e67ed6aec16aa6c30e152d6065e952.tar.gz
rust-29ff00cc97e67ed6aec16aa6c30e152d6065e952.zip
Auto merge of #21937 - alexcrichton:issue-21929, r=aturon
These were forgotten reexports from #21718

Closes #21929
Diffstat (limited to 'src')
-rw-r--r--src/libcollections/str.rs2
-rw-r--r--src/libstd/num/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index 65c397359f4..edb6d2de1c8 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -80,7 +80,7 @@ pub use core::str::{Lines, LinesAny, MatchIndices, SplitStr, CharRange};
 pub use core::str::{Split, SplitTerminator};
 pub use core::str::{SplitN, RSplitN};
 pub use core::str::{from_utf8, CharEq, Chars, CharIndices, Bytes};
-pub use core::str::{from_utf8_unchecked, from_c_str};
+pub use core::str::{from_utf8_unchecked, from_c_str, ParseBoolError};
 pub use unicode::str::{Words, Graphemes, GraphemeIndices};
 
 /*
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index a996ad1f5b3..29532cb9b02 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -29,7 +29,7 @@ pub use core::num::{from_int, from_i8, from_i16, from_i32, from_i64};
 pub use core::num::{from_uint, from_u8, from_u16, from_u32, from_u64};
 pub use core::num::{from_f32, from_f64};
 pub use core::num::{FromStrRadix, from_str_radix};
-pub use core::num::{FpCategory};
+pub use core::num::{FpCategory, ParseIntError, ParseFloatError};
 
 use option::Option;