about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2017-09-19 21:50:23 +0200
committerGitHub <noreply@github.com>2017-09-19 21:50:23 +0200
commit23b402015679af22efbd00b10554be17f1777829 (patch)
tree536ce8051018f720af9d1a951d05fef73a56eed4
parent64fa14e97705d4bb72c410a60a2f48cf64603d31 (diff)
parent86a79c97104983503e2088b182bab77d1f243bde (diff)
downloadrust-23b402015679af22efbd00b10554be17f1777829.tar.gz
rust-23b402015679af22efbd00b10554be17f1777829.zip
Rollup merge of #44689 - behnam:unicode, r=sfackler
[libstd_unicode] Expose UnicodeVersion type

In <https://github.com/rust-lang/rust/pull/42998>, we added an
uninstantiable type for the internal `UNICODE_VERSION` value,
`UnicodeVersion`, but it was not made public to the outside of the
crate, resulting in the value becoming less useful. Here we make the
type accessible from the outside.

Also add a run-pass test to make sure the type and value can be accessed
as intended.
-rw-r--r--src/libstd_unicode/char.rs2
-rw-r--r--src/test/run-pass/char_unicode.rs22
2 files changed, 23 insertions, 1 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs
index 5cf05bff8c5..5c0c7a4fbca 100644
--- a/src/libstd_unicode/char.rs
+++ b/src/libstd_unicode/char.rs
@@ -47,7 +47,7 @@ pub use core::char::CharTryFromError;
 #[unstable(feature = "decode_utf8", issue = "33906")]
 pub use core::char::{DecodeUtf8, decode_utf8};
 #[unstable(feature = "unicode", issue = "27783")]
-pub use tables::UNICODE_VERSION;
+pub use tables::{UnicodeVersion, UNICODE_VERSION};
 
 /// Returns an iterator that yields the lowercase equivalent of a `char`.
 ///
diff --git a/src/test/run-pass/char_unicode.rs b/src/test/run-pass/char_unicode.rs
new file mode 100644
index 00000000000..b4884acdd07
--- /dev/null
+++ b/src/test/run-pass/char_unicode.rs
@@ -0,0 +1,22 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+#![feature(unicode)]
+
+
+/// Tests access to the internal Unicode Version type and value.
+pub fn main() {
+    check(std::char::UNICODE_VERSION);
+}
+
+pub fn check(unicode_version: std::char::UnicodeVersion) {
+    assert!(unicode_version.major >= 10);
+}