update to Unicode 9 ; clean up no_std and related

kwantam · kwantam · commit 02cc96c73517 · 2016-12-23T16:04:00.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,12 @@ language: rust
 rust: 'nightly'
 sudo: false
 script:
-  - cargo build --verbose --features no_std
-  - cargo test --verbose --features no_std
+  - cargo build --verbose --features bench
+  - cargo test --verbose --features bench
+  - cargo bench --verbose --features bench
   - cargo clean
-  - cargo build --verbose --features default
-  - cargo test --verbose --features default
-  - cargo bench --verbose --features default
+  - cargo build --verbose
+  - cargo test --verbose
   - rustdoc --test README.md -L target/debug -L target/debug/deps
   - cargo doc
 after_success: |
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "unicode-xid"
-version = "0.0.3"
+version = "0.0.4"
 authors = ["erick.tryzelaar <erick.tryzelaar@gmail.com>",
            "kwantam <kwantam@gmail.com>",
            ]
@@ -23,3 +23,4 @@ exclude = [ "target/*", "Cargo.lock" ]
 [features]
 default = []
 no_std = []
+bench = []
diff --git a/README.md b/README.md
@@ -30,5 +30,5 @@ to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-unicode-xid = "0.0.3"
+unicode-xid = "0.0.4"
 ```
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -125,15 +125,8 @@ def escape_char(c):
 def emit_bsearch_range_table(f):
     f.write("""
 fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool {
-    #[cfg(feature = "no_std")]
     use core::cmp::Ordering::{Equal, Less, Greater};
 
-    #[cfg(feature = "no_std")]
-    use core::slice::SliceExt;
-
-    #[cfg(not(feature = "no_std"))]
-    use std::cmp::Ordering::{Equal, Less, Greater};
-
     r.binary_search_by(|&(lo,hi)| {
         if lo <= c && c <= hi { Equal }
         else if hi < c { Less }
diff --git a/src/lib.rs b/src/lib.rs
@@ -34,23 +34,21 @@
 //!
 //! ```toml
 //! [dependencies]
-//! unicode-xid = "0.0.3"
+//! unicode-xid = "0.0.4"
 //! ```
 
 #![deny(missing_docs, unsafe_code)]
 #![doc(html_logo_url = "https://unicode-rs.github.io/unicode-rs_sm.png",
        html_favicon_url = "https://unicode-rs.github.io/unicode-rs_sm.png")]
 
-#![cfg_attr(feature = "no_std", no_std)]
-#![cfg_attr(feature = "no_std", feature(no_std, core_slice_ext))]
+#![no_std]
+#![cfg_attr(feature = "bench", feature(test, unicode))]
 
-#![cfg_attr(test, feature(test, unicode))]
-
-#[cfg(all(test, feature = "no_std"))]
+#[cfg(test)]
 #[macro_use]
 extern crate std;
 
-#[cfg(test)]
+#[cfg(feature = "bench")]
 extern crate test;
 
 use tables::derived_property;
diff --git a/src/tables.rs b/src/tables.rs
diff --git a/src/tests.rs b/src/tests.rs
@@ -8,14 +8,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[cfg(feature = "bench")]
 use std::iter;
+#[cfg(feature = "bench")]
 use test::Bencher;
+#[cfg(feature = "bench")]
+use std::prelude::v1::*;
 
 use super::UnicodeXID;
 
-#[cfg(feature = "no_std")]
-use std::prelude::v1::*;
-
+#[cfg(feature = "bench")]
 #[bench]
 fn cargo_is_xid_start(b: &mut Bencher) {
     let string = iter::repeat('a').take(4096).collect::<String>();
@@ -26,6 +28,7 @@ fn cargo_is_xid_start(b: &mut Bencher) {
     });
 }
 
+#[cfg(feature = "bench")]
 #[bench]
 fn stdlib_is_xid_start(b: &mut Bencher) {
     let string = iter::repeat('a').take(4096).collect::<String>();
@@ -36,6 +39,7 @@ fn stdlib_is_xid_start(b: &mut Bencher) {
     });
 }
 
+#[cfg(feature = "bench")]
 #[bench]
 fn cargo_xid_continue(b: &mut Bencher) {
     let string = iter::repeat('a').take(4096).collect::<String>();
@@ -46,6 +50,7 @@ fn cargo_xid_continue(b: &mut Bencher) {
     });
 }
 
+#[cfg(feature = "bench")]
 #[bench]
 fn stdlib_xid_continue(b: &mut Bencher) {
     let string = iter::repeat('a').take(4096).collect::<String>();
