Reexport from core::unicode::char in core::char rather than vice versa

3 files changed, 16 insertions, 23 deletions

diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs
index c6b620e5238..3efa8396331 100644
--- a/src/libcore/char/mod.rs
+++ b/src/libcore/char/mod.rs
@@ -15,6 +15,18 @@
 #![allow(non_snake_case)]
 #![stable(feature = "core_char", since = "1.2.0")]
 
+// stable re-exports
+#[stable(feature = "rust1", since = "1.0.0")]
+pub use unicode::char::{ToLowercase, ToUppercase};
+#[stable(feature = "decode_utf16", since = "1.9.0")]
+pub use unicode::char::{decode_utf16, DecodeUtf16, DecodeUtf16Error};
+
+// unstable re-exports
+#[unstable(feature = "unicode", issue = "27783")]
+pub use unicode::tables::{UNICODE_VERSION};
+#[unstable(feature = "unicode", issue = "27783")]
+pub use unicode::version::UnicodeVersion;
+
 mod printable;
 
 use self::printable::is_printable;
diff --git a/src/libcore/unicode/char.rs b/src/libcore/unicode/char.rs
index 0e8b09f621a..e75338aedf1 100644
--- a/src/libcore/unicode/char.rs
+++ b/src/libcore/unicode/char.rs
@@ -28,31 +28,12 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
+use char::*;
 use char::CharExt as C;
 use iter::FusedIterator;
 use fmt::{self, Write};
 use unicode::tables::{conversions, derived_property, general_category, property};
 
-// stable re-exports
-#[stable(feature = "rust1", since = "1.0.0")]
-pub use char::{MAX, from_digit, from_u32, from_u32_unchecked};
-#[stable(feature = "rust1", since = "1.0.0")]
-pub use char::{EscapeDebug, EscapeDefault, EscapeUnicode};
-#[stable(feature = "decode_utf16", since = "1.9.0")]
-pub use char::REPLACEMENT_CHARACTER;
-#[stable(feature = "char_from_str", since = "1.20.0")]
-pub use char::ParseCharError;
-
-// unstable re-exports
-#[stable(feature = "try_from", since = "1.26.0")]
-pub use char::CharTryFromError;
-#[unstable(feature = "decode_utf8", issue = "33906")]
-pub use char::{DecodeUtf8, decode_utf8};
-#[unstable(feature = "unicode", issue = "27783")]
-pub use unicode::tables::{UNICODE_VERSION};
-#[unstable(feature = "unicode", issue = "27783")]
-pub use unicode::version::UnicodeVersion;
-
 /// Returns an iterator that yields the lowercase equivalent of a `char`.
 ///
 /// This `struct` is created by the [`to_lowercase`] method on [`char`]. See
diff --git a/src/libcore/unicode/mod.rs b/src/libcore/unicode/mod.rs
index aaf8081799f..0ea1aa12146 100644
--- a/src/libcore/unicode/mod.rs
+++ b/src/libcore/unicode/mod.rs
@@ -12,11 +12,11 @@
 #![allow(missing_docs)]
 
 mod bool_trie;
-mod tables;
-mod version;
+pub(crate) mod tables;
+pub(crate) mod version;
 
 pub mod str;
-pub mod char;
+pub(crate) mod char;
 
 // For use in liballoc, not re-exported in libstd.
 pub mod derived_property {