make no_std a feature to allow builds in beta; bump version

kwantam · kwantam · commit ab525e661654 · 2015-04-15T17:56:43.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,11 @@
 language: rust
 sudo: false
 script:
-  - cargo build --verbose
-  - cargo test --verbose
+  - cargo build --verbose --features no_std
+  - cargo test --verbose --features no_std
+  - cargo clean
+  - cargo build --verbose --features default
+  - cargo test --verbose --features default
   - 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-width"
-version = "0.0.1"
+version = "0.1.0"
 authors = ["kwantam <kwantam@gmail.com>"]
 
 homepage = "https://github.com/unicode-rs/unicode-width"
@@ -16,3 +16,7 @@ according to Unicode Standard Annex #11 rules.
 """
 
 exclude = [ "target/*", "Cargo.lock" ]
+
+[features]
+default = []
+no_std = []
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Determine displayed width of `char` and `str` types according to
 [Unicode Standard Annex #11](http://www.unicode.org/reports/tr11/)
 rules.
 
-[![Build Status](https://travis-ci.org/unicode-rs/unicode-width.svg?branch=master)](https://travis-ci.org/unicode-rs/unicode-width)
+[![Build Status](https://travis-ci.org/unicode-rs/unicode-width.svg)](https://travis-ci.org/unicode-rs/unicode-width)
 
 ```rust
 extern crate unicode_width;
@@ -21,4 +21,17 @@ fn main() {
 }
 ```
 
-[Documentation](http://unicode-rs.github.io/unicode-width/unicode_width/)
+## features
+
+unicode-width supports a `no_std` feature. This eliminates dependence
+on std, and instead uses equivalent functions from core.
+
+## crates.io
+
+You can use this package in your project by adding the following
+to your `Cargo.toml`:
+
+```toml
+[dependencies]
+unicode-width = "0.1.0"
+```
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# Copyright 2011-2015 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -197,14 +197,20 @@ def emit_table(f, name, t_data, t_type = "&'static [(char, char)]", is_pub=True,
     f.write("\n    ];\n\n")
 
 def emit_charwidth_module(f, width_table):
-    f.write("pub mod charwidth {\n")
-    f.write("    use core::option::Option;\n")
-    f.write("    use core::option::Option::{Some, None};\n")
-    f.write("    use core::slice::SliceExt;\n")
-    f.write("    use core::result::Result::{Ok, Err};\n")
+    f.write("pub mod charwidth {")
     f.write("""
+    #[cfg(feature = "no_std")]
+    use core::option::Option::{self, Some, None};
+    #[cfg(feature = "no_std")]
+    use core::slice::SliceExt;
+    #[cfg(feature = "no_std")]
+    use core::result::Result::{Ok, Err};
+
     fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 {
+        #[cfg(feature = "no_std")]
         use core::cmp::Ordering::{Equal, Less, Greater};
+        #[cfg(not(feature = "no_std"))]
+        use std::cmp::Ordering::{Equal, Less, Greater};
         match 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
@@ -27,31 +27,45 @@
 //! }
 //! ```
 //!
+//! # features
+//!
+//! unicode-width supports a `no_std` feature. This eliminates dependence
+//! on std, and instead uses equivalent functions from core.
+//!
 //! # crates.io
 //!
 //! You can use this package in your project by adding the following
 //! to your `Cargo.toml`:
 //!
 //! ```toml
 //! [dependencies]
-//! unicode-width = "0.0.1"
+//! unicode-width = "0.1.0"
 //! ```
 
 #![deny(missing_docs, unsafe_code)]
-#![feature(no_std, core)]
-#![no_std]
 
+#![cfg_attr(feature = "no_std", no_std)]
+#![cfg_attr(feature = "no_std", feature(no_std, core))]
+
+#[cfg(feature = "no_std")]
+#[macro_use]
 extern crate core;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "no_std"))]
 #[macro_use]
 extern crate std;
 
+#[cfg(feature = "no_std")]
 use core::prelude::*;
 
 use tables::charwidth as cw;
 pub use tables::UNICODE_VERSION;
 
+#[cfg(feature = "no_std")]
+use core::ops::Add;
+#[cfg(not(feature = "no_std"))]
+use std::ops::Add;
+
 mod tables;
 
 /// Methods for determining displayed width of Unicode characters.
@@ -106,11 +120,11 @@ pub trait UnicodeWidthStr {
 
 impl UnicodeWidthStr for str {
     fn width(&self) -> usize {
-        self.chars().map(|c| cw::width(c, false).unwrap_or(0)).sum()
+        self.chars().map(|c| cw::width(c, false).unwrap_or(0)).fold(0, Add::add)
     }
 
     fn width_cjk(&self) -> usize {
-        self.chars().map(|c| cw::width(c, true).unwrap_or(0)).sum()
+        self.chars().map(|c| cw::width(c, true).unwrap_or(0)).fold(0, Add::add)
     }
 }
 
@@ -133,6 +147,7 @@ mod tests {
     #[test]
     fn test_char() {
         use super::UnicodeWidthChar;
+        #[cfg(feature = "no_std")]
         use core::option::Option::{Some, None};
 
         assert_eq!(UnicodeWidthChar::width('ｈ'), Some(2));
@@ -148,6 +163,7 @@ mod tests {
     #[test]
     fn test_char2() {
         use super::UnicodeWidthChar;
+        #[cfg(feature = "no_std")]
         use core::option::Option::{Some, None};
 
         assert_eq!(UnicodeWidthChar::width('\x00'),Some(0));
diff --git a/src/tables.rs b/src/tables.rs
@@ -17,13 +17,18 @@
 pub const UNICODE_VERSION: (u64, u64, u64) = (7, 0, 0);
 
 pub mod charwidth {
-    use core::option::Option;
-    use core::option::Option::{Some, None};
+    #[cfg(feature = "no_std")]
+    use core::option::Option::{self, Some, None};
+    #[cfg(feature = "no_std")]
     use core::slice::SliceExt;
+    #[cfg(feature = "no_std")]
     use core::result::Result::{Ok, Err};
 
     fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 {
+        #[cfg(feature = "no_std")]
         use core::cmp::Ordering::{Equal, Less, Greater};
+        #[cfg(not(feature = "no_std"))]
+        use std::cmp::Ordering::{Equal, Less, Greater};
         match r.binary_search_by(|&(lo, hi, _, _)| {
             if lo <= c && c <= hi { Equal }
             else if hi < c { Less }
