about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-06 10:26:57 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 00:13:53 +0200
commit670e85339a5014ad6fde02beb0603d2e12027a89 (patch)
tree4931fb0a9df283080834009213dbfa075b41fc89 /src/libcore
parentd4ed1e6fa4978141408ef01d0d35c7bd142dd164 (diff)
downloadrust-670e85339a5014ad6fde02beb0603d2e12027a89.tar.gz
rust-670e85339a5014ad6fde02beb0603d2e12027a89.zip
Move core::char::printable to core::unicode::printable
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/char/methods.rs2
-rw-r--r--src/libcore/char/mod.rs1
-rw-r--r--src/libcore/unicode/mod.rs1
-rw-r--r--src/libcore/unicode/printable.py (renamed from src/libcore/char/printable.py)2
-rw-r--r--src/libcore/unicode/printable.rs (renamed from src/libcore/char/printable.rs)2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/char/methods.rs b/src/libcore/char/methods.rs
index 2c433a7ac9e..374adafef64 100644
--- a/src/libcore/char/methods.rs
+++ b/src/libcore/char/methods.rs
@@ -13,7 +13,7 @@
 use slice;
 use str::from_utf8_unchecked_mut;
 use super::*;
-use super::printable::is_printable;
+use unicode::printable::is_printable;
 use unicode::tables::{conversions, derived_property, general_category, property};
 
 #[lang = "char"]
diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs
index c051a1ff8c8..b2af95eb5ba 100644
--- a/src/libcore/char/mod.rs
+++ b/src/libcore/char/mod.rs
@@ -32,7 +32,6 @@
 mod convert;
 mod decode;
 mod methods;
-mod printable;
 
 // stable re-exports
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libcore/unicode/mod.rs b/src/libcore/unicode/mod.rs
index 9ab8cb748b1..0fbc4dcd175 100644
--- a/src/libcore/unicode/mod.rs
+++ b/src/libcore/unicode/mod.rs
@@ -12,6 +12,7 @@
 #![allow(missing_docs)]
 
 mod bool_trie;
+pub(crate) mod printable;
 pub(crate) mod tables;
 pub(crate) mod version;
 
diff --git a/src/libcore/char/printable.py b/src/libcore/unicode/printable.py
index 484822e10aa..9410dafbbc3 100644
--- a/src/libcore/char/printable.py
+++ b/src/libcore/unicode/printable.py
@@ -187,7 +187,7 @@ def main():
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: The following code was generated by "src/libcore/char/printable.py",
+// NOTE: The following code was generated by "src/libcore/unicode/printable.py",
 //       do not edit directly!
 
 fn check(x: u16, singletonuppers: &[(u8, u8)], singletonlowers: &[u8],
diff --git a/src/libcore/char/printable.rs b/src/libcore/unicode/printable.rs
index ce011fab187..4426c32eebc 100644
--- a/src/libcore/char/printable.rs
+++ b/src/libcore/unicode/printable.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: The following code was generated by "src/libcore/char/printable.py",
+// NOTE: The following code was generated by "src/libcore/unicode/printable.py",
 //       do not edit directly!
 
 fn check(x: u16, singletonuppers: &[(u8, u8)], singletonlowers: &[u8],