Merge #202

202: More small fixes r=behnam a=behnam

Author: bors[bot]

apps/cli/Cargo.toml

@@ -11,8 +11,7 @@ readme = "README.md"
 
 
 [dependencies]
-unic-ucd = { path = "../../unic/ucd/", version = "0.6.0" }
-unic-char-property = { path = "../../unic/char/property/", version = "0.6.0" }
+unic = { path = "../../unic/", version = "0.6.0" }
 
 clap = "2.29"
 lazy_static = "1.0"

apps/cli/src/bin/unic-inspector.rs

@@ -10,19 +10,19 @@
 
 #[macro_use]
 extern crate clap;
+
 #[macro_use]
 extern crate prettytable;
 
-extern crate unic_char_property;
+extern crate unic;
 extern crate unic_cli;
-extern crate unic_ucd;
 
 use clap::Arg;
 use prettytable::format::TableFormat;
 use prettytable::Table;
 
-use unic_char_property::EnumeratedCharProperty;
-use unic_ucd::{GeneralCategory, Name};
+use unic::char::property::EnumeratedCharProperty;
+use unic::ucd::{GeneralCategory, Name};
 
 fn main() {
     let app = app_from_crate!()

apps/cli/src/bin/unic-versions.rs

@@ -0,0 +1,94 @@
+// Copyright 2017 The UNIC Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// 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.
+
+#![forbid(unsafe_code)]
+
+//! Command-line tool to list versions of UNIC components.
+
+extern crate unic;
+
+macro_rules! print_component_desc {
+    ( $component:tt ) => (
+        println!("Component: {}", unic::$component::PKG_DESCRIPTION);
+    );
+}
+
+macro_rules! print_component_name_version {
+    ( $component:tt ) => (
+        println!(
+            "Package: {} ({})",
+            unic::$component::PKG_NAME,
+            unic::$component::PKG_VERSION
+        );
+    );
+}
+
+macro_rules! print_unicode_version {
+    ( $component:tt ) => (
+        println!(
+            "Unicode Version: {}.{}.{}",
+            unic::$component::UNICODE_VERSION.major,
+            unic::$component::UNICODE_VERSION.minor,
+            unic::$component::UNICODE_VERSION.micro
+        );
+    );
+}
+
+macro_rules! print_emoji_version {
+    ( $component:tt ) => (
+        println!(
+            "Emoji Version: {}.{}.{}",
+            unic::$component::EMOJI_VERSION.major,
+            unic::$component::EMOJI_VERSION.minor,
+            unic::$component::EMOJI_VERSION.micro
+        );
+    );
+}
+
+macro_rules! print_component_info {
+    ( $component:tt ) => (
+        print_component_desc!($component);
+        print_component_name_version!($component);
+        println!();
+    );
+}
+
+macro_rules! print_component_info_with_unicode_version {
+    ( $component:tt ) => (
+        print_component_desc!($component);
+        print_component_name_version!($component);
+        print_unicode_version!($component);
+        println!();
+    );
+}
+
+macro_rules! print_component_info_with_emoji_version {
+    ( $component:tt ) => (
+        print_component_desc!($component);
+        print_component_name_version!($component);
+        print_emoji_version!($component);
+        println!();
+    );
+}
+
+fn main() {
+    println!("UNIC: Unicode and Internationalization Crates for Rust");
+    println!("Package: unic ({})", unic::PKG_VERSION);
+    println!();
+
+    print_component_info!(char);
+
+    print_component_info_with_unicode_version!(ucd);
+    print_component_info_with_unicode_version!(bidi);
+    print_component_info_with_unicode_version!(normal);
+    print_component_info_with_unicode_version!(idna);
+
+    print_component_info_with_emoji_version!(emoji);
+}

etc/check-components.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Copyright 2017 The UNIC Project Developers.
+#
+# See the COPYRIGHT file at the top-level directory of this distribution.
+#
+# 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.
+
+# Since `cargo publish --all` does not exist yet, we use this dumb alternative
+# solution for now.
+#
+# Main downside of this approch is that there are separate `target/`
+# directories used for each component, increasing the test and publish process
+# time.
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. "$DIR/common.sh"
+
+
+# Steps
+
+# Package all components
+for component in $COMPONENTS; do
+    pkg_file="$component/src/pkg_info.rs"
+    if [ ! -f "$pkg_file" ]
+    then
+        echo "Missing pkg_file: $component"
+    fi
+done

etc/common.sh

@@ -15,6 +15,8 @@ set -e
 
 # List of components, in order of dependency
 export COMPONENTS="
+    unic/common
+
     unic/char/property
     unic/char/range
     unic/char

unic/Cargo.toml

@@ -14,13 +14,14 @@ exclude = []
 
 [features]
 default = []
-unstable = []  # Rust nightly features
+unstable = ["unic-common/unstable"]  # Rust nightly features
 bench_it = ["unic-bidi/bench_it"]
 serde = ["unic-bidi/serde"]
 
 [dependencies]
 unic-bidi = { path = "bidi/", version = "0.6.0" }
 unic-char = { path = "char/", version = "0.6.0", features = ["std"] }
+unic-common = { path = "common/", version = "0.6.0" }
 unic-emoji = { path = "emoji/", version = "0.6.0" }
 unic-idna = { path = "idna/", version = "0.6.0" }
 unic-normal = { path = "normal/", version = "0.6.0" }

unic/bidi/src/lib.rs

@@ -77,26 +77,23 @@ extern crate serde;
 #[cfg(all(feature = "serde", test))]
 extern crate serde_test;
 
+pub use unic_ucd_bidi::UNICODE_VERSION;
+pub use unic_ucd_bidi::{bidi_class, BidiClass, BidiClassCategory};
+
+mod pkg_info;
+pub use pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
+
 pub mod format_chars;
+
 pub mod level;
+pub use level::Level;
 
 mod bidi_info;
-mod explicit;
-mod implicit;
-mod prepare;
-
-pub use unic_ucd_bidi::UNICODE_VERSION;
-pub use unic_ucd_bidi::{bidi_class, BidiClass, BidiClassCategory};
-
 pub use bidi_info::{BidiInfo, ParagraphInfo};
-pub use level::Level;
-pub use prepare::LevelRun;
 
-/// UNIC component version.
-pub const PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+mod explicit;
 
-/// UNIC component name.
-pub const PKG_NAME: &str = env!("CARGO_PKG_NAME");
+mod implicit;
 
-/// UNIC component description.
-pub const PKG_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION");
+mod prepare;
+pub use prepare::LevelRun;

unic/bidi/src/pkg_info.rs

@@ -0,0 +1,20 @@
+// Copyright 2017 The UNIC Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// 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.
+
+//! Package information
+
+/// UNIC component version.
+pub const PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+/// UNIC component name.
+pub const PKG_NAME: &str = env!("CARGO_PKG_NAME");
+
+/// UNIC component description.
+pub const PKG_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION");

unic/char/property/src/lib.rs

@@ -28,25 +28,26 @@
 #[macro_use]
 extern crate unic_char_range;
 
-// pub because is used in macros, called from macro call-site.
-pub mod tables;
-
-mod macros;
 mod pkg_info;
-mod property;
-mod range_types;
+pub use pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
+mod property;
 pub use self::property::{CharProperty, PartialCharProperty, TotalCharProperty};
-pub use self::range_types::{
+
+mod range_types;
+pub use range_types::{
     BinaryCharProperty,
     CustomCharProperty,
     EnumeratedCharProperty,
     NumericCharProperty,
     NumericCharPropertyValue,
 };
 
+mod macros;
+
+// pub because is used in macros, called from macro call-site.
+pub mod tables;
+
 // Used in macros
 #[doc(hidden)]
 pub use core::{fmt as __fmt, str as __str};
-
-pub use pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};

unic/char/range/src/lib.rs

@@ -52,19 +52,21 @@
 #[cfg(feature = "std")]
 extern crate core;
 
-mod iter;
-mod macros;
 mod pkg_info;
+pub use pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
+
+mod iter;
+pub use iter::CharIter;
+
 mod range;
+pub use range::CharRange;
+
+mod macros;
+
 mod step;
 
 #[cfg(feature = "fused")]
 mod iter_fused;
 
 #[cfg(feature = "trusted-len")]
 mod iter_trusted_len;
-
-pub use range::CharRange;
-pub use iter::CharIter;
-
-pub use pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};