about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-06 14:18:28 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 00:13:53 +0200
commit1ca2905cda99dd395347b46c3ce225f58b4d3844 (patch)
tree51ddb09c1070b128e4eeafa7f29f58d0ab04e2dc
parent670e85339a5014ad6fde02beb0603d2e12027a89 (diff)
downloadrust-1ca2905cda99dd395347b46c3ce225f58b4d3844.tar.gz
rust-1ca2905cda99dd395347b46c3ce225f58b4d3844.zip
Dedicated tracking issue for UnicodeVersion and UNICODE_VERSION.
-rw-r--r--src/libcore/char/mod.rs6
-rw-r--r--src/libcore/unicode/tables.rs1
-rwxr-xr-xsrc/libcore/unicode/unicode.py1
-rw-r--r--src/libcore/unicode/version.rs1
-rw-r--r--src/test/run-pass/char_unicode.rs4
5 files changed, 7 insertions, 6 deletions
diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs
index b2af95eb5ba..9edc0c88756 100644
--- a/src/libcore/char/mod.rs
+++ b/src/libcore/char/mod.rs
@@ -46,9 +46,9 @@ pub use self::convert::CharTryFromError;
 pub use self::decode::{decode_utf16, DecodeUtf16, DecodeUtf16Error};
 
 // unstable re-exports
-#[unstable(feature = "unicode", issue = "27783")]
-pub use unicode::tables::{UNICODE_VERSION};
-#[unstable(feature = "unicode", issue = "27783")]
+#[unstable(feature = "unicode_version", issue = "49726")]
+pub use unicode::tables::UNICODE_VERSION;
+#[unstable(feature = "unicode_version", issue = "49726")]
 pub use unicode::version::UnicodeVersion;
 #[unstable(feature = "decode_utf8", issue = "33906")]
 pub use self::decode::{decode_utf8, DecodeUtf8, InvalidSequence};
diff --git a/src/libcore/unicode/tables.rs b/src/libcore/unicode/tables.rs
index 1f7b1bde914..3fbbc011bc4 100644
--- a/src/libcore/unicode/tables.rs
+++ b/src/libcore/unicode/tables.rs
@@ -17,6 +17,7 @@ use unicode::bool_trie::{BoolTrie, SmallBoolTrie};
 
 /// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
 /// `char` and `str` methods are based on.
+#[unstable(feature = "unicode_version", issue = "49726")]
 pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
     major: 10,
     minor: 0,
diff --git a/src/libcore/unicode/unicode.py b/src/libcore/unicode/unicode.py
index 82262cc7662..75ec01944bf 100755
--- a/src/libcore/unicode/unicode.py
+++ b/src/libcore/unicode/unicode.py
@@ -471,6 +471,7 @@ if __name__ == "__main__":
         rf.write("""
 /// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
 /// `char` and `str` methods are based on.
+#[unstable(feature = "unicode_version", issue = "49726")]
 pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
     major: %s,
     minor: %s,
diff --git a/src/libcore/unicode/version.rs b/src/libcore/unicode/version.rs
index d82a749d917..59ebf5f5012 100644
--- a/src/libcore/unicode/version.rs
+++ b/src/libcore/unicode/version.rs
@@ -12,6 +12,7 @@
 ///
 /// See also: <http://www.unicode.org/versions/>
 #[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
+#[unstable(feature = "unicode_version", issue = "49726")]
 pub struct UnicodeVersion {
     /// Major version.
     pub major: u32,
diff --git a/src/test/run-pass/char_unicode.rs b/src/test/run-pass/char_unicode.rs
index b4884acdd07..bfc7faac06e 100644
--- a/src/test/run-pass/char_unicode.rs
+++ b/src/test/run-pass/char_unicode.rs
@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-#![feature(unicode)]
-
+#![feature(unicode_version)]
 
 /// Tests access to the internal Unicode Version type and value.
 pub fn main() {