From 88da5682c364c9c89c2e7c54a4f2c94999cdc644 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 7 Dec 2020 16:16:42 +0300
Subject: [PATCH] Privatize some of libcore unicode_internals

My understanding is that these API are perma unstable, so it doesn't
make sense to pollute docs & IDE completion[1] with them.

[1]: https://github.com/rust-analyzer/rust-analyzer/issues/6738
---
 library/alloc/src/str.rs        |  2 +-
 library/core/src/unicode/mod.rs | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/library/alloc/src/str.rs b/library/alloc/src/str.rs
index 339592728ac24..578eca7d893d2 100644
--- a/library/alloc/src/str.rs
+++ b/library/alloc/src/str.rs
@@ -388,7 +388,7 @@ impl str {
         }
 
         fn case_ignoreable_then_cased<I: Iterator<Item = char>>(iter: I) -> bool {
-            use core::unicode::derived_property::{Case_Ignorable, Cased};
+            use core::unicode::{Case_Ignorable, Cased};
             match iter.skip_while(|&c| Case_Ignorable(c)).next() {
                 Some(c) => Cased(c),
                 None => false,
diff --git a/library/core/src/unicode/mod.rs b/library/core/src/unicode/mod.rs
index 28c07f7717046..37ca0a0779b17 100644
--- a/library/core/src/unicode/mod.rs
+++ b/library/core/src/unicode/mod.rs
@@ -18,17 +18,14 @@ mod unicode_data;
 pub const UNICODE_VERSION: (u8, u8, u8) = unicode_data::UNICODE_VERSION;
 
 // For use in liballoc, not re-exported in libstd.
-pub mod derived_property {
-    pub use super::{Case_Ignorable, Cased};
-}
+pub use unicode_data::{
+    case_ignorable::lookup as Case_Ignorable, cased::lookup as Cased, conversions,
+};
 
-pub use unicode_data::alphabetic::lookup as Alphabetic;
-pub use unicode_data::case_ignorable::lookup as Case_Ignorable;
-pub use unicode_data::cased::lookup as Cased;
-pub use unicode_data::cc::lookup as Cc;
-pub use unicode_data::conversions;
-pub use unicode_data::grapheme_extend::lookup as Grapheme_Extend;
-pub use unicode_data::lowercase::lookup as Lowercase;
-pub use unicode_data::n::lookup as N;
-pub use unicode_data::uppercase::lookup as Uppercase;
-pub use unicode_data::white_space::lookup as White_Space;
+pub(crate) use unicode_data::alphabetic::lookup as Alphabetic;
+pub(crate) use unicode_data::cc::lookup as Cc;
+pub(crate) use unicode_data::grapheme_extend::lookup as Grapheme_Extend;
+pub(crate) use unicode_data::lowercase::lookup as Lowercase;
+pub(crate) use unicode_data::n::lookup as N;
+pub(crate) use unicode_data::uppercase::lookup as Uppercase;
+pub(crate) use unicode_data::white_space::lookup as White_Space;