From 76e2743db2a55bfc1b10f86643647b15c935e4cb Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 17 Jun 2018 01:20:34 +0200 Subject: [PATCH] Fork from huonw. --- .gitignore | 6 +-- .travis.yml | 2 +- Cargo.toml | 13 +++--- README.md | 10 ++--- deploy-docs.sh | 20 ---------- examples/count.rs | 4 +- generator/Cargo.lock | 2 +- generator/Cargo.toml | 2 +- src/lib.rs | 40 +++++++++---------- unicode_names2_macros/Cargo.toml | 28 +++++++++++++ .../src/lib.rs | 6 +-- .../tests/test.rs | 2 +- unicode_names_macros/Cargo.toml | 27 ------------- 13 files changed, 72 insertions(+), 90 deletions(-) delete mode 100755 deploy-docs.sh create mode 100644 unicode_names2_macros/Cargo.toml rename {unicode_names_macros => unicode_names2_macros}/src/lib.rs (93%) rename {unicode_names_macros => unicode_names2_macros}/tests/test.rs (90%) delete mode 100644 unicode_names_macros/Cargo.toml diff --git a/.gitignore b/.gitignore index ee142fc..10afc3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /target -/unicode_names_macros/target +/unicode_names2_macros/target /Cargo.lock -/unicode_names_macros/Cargo.lock +/unicode_names2_macros/Cargo.lock /data/UnicodeData.txt -/generator/target \ No newline at end of file +/generator/target diff --git a/.travis.yml b/.travis.yml index 85b18da..87e1844 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: travis-cargo test && travis-cargo bench && travis-cargo doc && - ( cd unicode_names_macros && travis-cargo build && travis-cargo test; ) && + ( cd unicode_names2_macros && travis-cargo build && travis-cargo test; ) && ( cd generator && travis-cargo build && travis-cargo test; ) after_success: - travis-cargo doc-upload && travis-cargo coveralls diff --git a/Cargo.toml b/Cargo.toml index c5076cf..654d8e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "unicode_names" +name = "unicode_names2" version = "0.1.7" authors = ["Huon Wilson ", - "Kang Seonghoon "] + "Kang Seonghoon ", + "Valentin Lorentz ",] -homepage = "https://github.com/huonw/unicode_names" -repository = "https://github.com/huonw/unicode_names" +homepage = "https://github.com/ProgVal/unicode_names2" +repository = "https://github.com/ProgVal/unicode_names2" documentation = "http://huonw.github.io/unicode_names/unicode_names/" license = "MIT/Apache-2.0" keywords = ["text", "unicode"] @@ -30,8 +31,8 @@ default = [] unstable = [] no_std = [] -[dev-dependencies.unicode_names_macros] -path = "unicode_names_macros" +[dev-dependencies.unicode_names2_macros] +path = "unicode_names2_macros" version = "*" [dev-dependencies] diff --git a/README.md b/README.md index 1852a14..e552f15 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# unicode_names +# unicode_names2 -[![Build Status](https://travis-ci.org/huonw/unicode_names.png)](https://travis-ci.org/huonw/unicode_names) [![Coverage Status](https://coveralls.io/repos/huonw/unicode_names/badge.svg)](https://coveralls.io/r/huonw/unicode_names) +[![Build Status](https://travis-ci.org/huonw/unicode_names2.png)](https://travis-ci.org/huonw/unicode_names2) [![Coverage Status](https://coveralls.io/repos/huonw/unicode_names2/badge.svg)](https://coveralls.io/r/huonw/unicode_names2) Time and memory efficiently mapping characters to and from their Unicode 7.0 names, at runtime and compile-time. ```rust -extern crate unicode_names; +extern crate unicode_names2; fn main() { - println!("☃ is called {}", unicode_names::name('☃')); // SNOWMAN - println!("{} is happy", unicode_names::character("white smiling face")); // ☺ + println!("☃ is called {}", unicode_names2::name('☃')); // SNOWMAN + println!("{} is happy", unicode_names2::character("white smiling face")); // ☺ // (NB. case insensitivity) } ``` diff --git a/deploy-docs.sh b/deploy-docs.sh deleted file mode 100755 index 4bc1063..0000000 --- a/deploy-docs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit -o nounset - -rev=$(git rev-parse --short HEAD) - -cd target/doc - -git init -git config --global user.name "doc bot" -git config --global user.email "docbot@travis" -git remote add upstream "https://$GH_TOKEN@github.com/huonw/unicode_names.git" -git fetch upstream -git reset upstream/gh-pages - -touch . - -git add -A . -git commit -m "rebuild pages at ${rev}" -git push upstream HEAD:gh-pages diff --git a/examples/count.rs b/examples/count.rs index d9cd1c9..f6fb71b 100644 --- a/examples/count.rs +++ b/examples/count.rs @@ -1,4 +1,4 @@ -extern crate unicode_names; +extern crate unicode_names2; use std::char; // Count how many code points have names in the standard. @@ -14,7 +14,7 @@ use std::char; fn main() { let number = (0u32..0x10FFFF) .filter(|x| { - char::from_u32(*x).map_or(false, |c| unicode_names::name(c).is_some()) + char::from_u32(*x).map_or(false, |c| unicode_names2::name(c).is_some()) }) .count(); diff --git a/generator/Cargo.lock b/generator/Cargo.lock index 36d62b8..78cd9d7 100644 --- a/generator/Cargo.lock +++ b/generator/Cargo.lock @@ -1,5 +1,5 @@ [root] -name = "unicode_names_generator" +name = "unicode_names2_generator" version = "0.0.1" dependencies = [ "getopts 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/generator/Cargo.toml b/generator/Cargo.toml index 31001ee..b5e8f03 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "unicode_names_generator" +name = "unicode_names2_generator" version = "0.0.1" authors = ["Huon Wilson "] diff --git a/src/lib.rs b/src/lib.rs index 1f81a72..f83be60 100755 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,20 +9,20 @@ //! name)`). //! //! ```rust -//! extern crate unicode_names; +//! extern crate unicode_names2; //! //! fn main() { -//! println!("☃ is called {:?}", unicode_names::name('☃')); // SNOWMAN -//! println!("{:?} is happy", unicode_names::character("white smiling face")); // ☺ +//! println!("☃ is called {:?}", unicode_names2::name('☃')); // SNOWMAN +//! println!("{:?} is happy", unicode_names2::character("white smiling face")); // ☺ //! // (NB. case insensitivity) //! } //! ``` //! -//! [**Source**](https://github.com/huonw/unicode_names). +//! [**Source**](https://github.com/huonw/unicode_names2). //! //! # Macros //! -//! The associated `unicode_names_macros` crate provides two macros +//! The associated `unicode_names2_macros` crate provides two macros //! for converting at compile-time, giving named literals similar to //! Python's `"\N{...}"`. //! @@ -35,8 +35,8 @@ //! //! ```rust //! #![feature(plugin)] -//! #![plugin(unicode_names_macros)] -//! # extern crate unicode_names; // pointless, just avoid extern crate being inserted +//! #![plugin(unicode_names2_macros)] +//! # extern crate unicode_names2; // pointless, just avoid extern crate being inserted //! //! fn main() { //! let x: char = named_char!("snowman"); @@ -54,8 +54,8 @@ //! //! ```toml //! [dependencies] -//! unicode_names = "0.1" -//! unicode_names_macros = "0.1" +//! unicode_names2 = "0.1" +//! unicode_names2_macros = "0.1" //! ``` #![cfg_attr(feature = "no_std", feature(no_std, core))] @@ -219,17 +219,17 @@ impl fmt::Display for Name { /// /// ```rust /// # #![allow(unstable)] -/// assert_eq!(unicode_names::name('a').map(|n| n.to_string()), +/// assert_eq!(unicode_names2::name('a').map(|n| n.to_string()), /// Some("LATIN SMALL LETTER A".to_string())); -/// assert_eq!(unicode_names::name('\u{2605}').map(|n| n.to_string()), +/// assert_eq!(unicode_names2::name('\u{2605}').map(|n| n.to_string()), /// Some("BLACK STAR".to_string())); -/// assert_eq!(unicode_names::name('☃').map(|n| n.to_string()), +/// assert_eq!(unicode_names2::name('☃').map(|n| n.to_string()), /// Some("SNOWMAN".to_string())); /// /// // control code -/// assert!(unicode_names::name('\x00').is_none()); +/// assert!(unicode_names2::name('\x00').is_none()); /// // unassigned -/// assert!(unicode_names::name('\u{10FFFF}').is_none()); +/// assert!(unicode_names2::name('\u{10FFFF}').is_none()); /// ``` pub fn name(c: char) -> Option { let cc = c as usize; @@ -302,13 +302,13 @@ fn split(hash: u64) -> (u32, u32, u32) { /// # Example /// /// ```rust -/// assert_eq!(unicode_names::character("LATIN SMALL LETTER A"), Some('a')); -/// assert_eq!(unicode_names::character("latin SMALL letter A"), Some('a')); -/// assert_eq!(unicode_names::character("latin small letter a"), Some('a')); -/// assert_eq!(unicode_names::character("BLACK STAR"), Some('★')); -/// assert_eq!(unicode_names::character("SNOWMAN"), Some('☃')); +/// assert_eq!(unicode_names2::character("LATIN SMALL LETTER A"), Some('a')); +/// assert_eq!(unicode_names2::character("latin SMALL letter A"), Some('a')); +/// assert_eq!(unicode_names2::character("latin small letter a"), Some('a')); +/// assert_eq!(unicode_names2::character("BLACK STAR"), Some('★')); +/// assert_eq!(unicode_names2::character("SNOWMAN"), Some('☃')); /// -/// assert_eq!(unicode_names::character("nonsense"), None); +/// assert_eq!(unicode_names2::character("nonsense"), None); /// ``` pub fn character(name: &str) -> Option { // + 1 so that we properly handle the case when `name` has a diff --git a/unicode_names2_macros/Cargo.toml b/unicode_names2_macros/Cargo.toml new file mode 100644 index 0000000..78044f1 --- /dev/null +++ b/unicode_names2_macros/Cargo.toml @@ -0,0 +1,28 @@ +[package] + +name = "unicode_names2_macros" +version = "0.1.5" +authors = ["Huon Wilson ", + "Valentin Lorentz "] + +homepage = "https://github.com/ProgVal/unicode_names2" +repository = "https://github.com/ProgVal/unicode_names2" +documentation = "http://huonw.github.io/unicode_names/unicode_names/" +license = "MIT/Apache-2.0" +keywords = ["text", "unicode", "plugin"] +description = "Support macros for `unicode_names2`." + +[features] +unstable = [] + +[dependencies] +regex = "0.1.8" +regex_macros = "0.1.2" + +[dependencies.unicode_names2] +path = ".." +version = "0.1" + +[lib] +name = "unicode_names2_macros" +plugin = true diff --git a/unicode_names_macros/src/lib.rs b/unicode_names2_macros/src/lib.rs similarity index 93% rename from unicode_names_macros/src/lib.rs rename to unicode_names2_macros/src/lib.rs index 26b8d4a..173c35c 100644 --- a/unicode_names_macros/src/lib.rs +++ b/unicode_names2_macros/src/lib.rs @@ -11,7 +11,7 @@ extern crate rustc; extern crate regex; -extern crate unicode_names; +extern crate unicode_names2; use syntax::ast; use syntax::codemap; @@ -30,7 +30,7 @@ fn named_char(cx: &mut ExtCtxt, sp: codemap::Span, tts: &[ast::TokenTree]) -> Box { match base::get_single_str_from_tts(cx, sp, tts, "named_char") { None => {} - Some(name) => match unicode_names::character(&name) { + Some(name) => match unicode_names2::character(&name) { None => cx.span_err(sp, &format!("`{}` does not name a character", name)), // everything worked! @@ -55,7 +55,7 @@ fn named(cx: &mut ExtCtxt, sp: codemap::Span, tts: &[ast::TokenTree]) -> Box return c.to_string(), None => { cx.span_err(sp, &format!("`{}` does not name a character", name)); diff --git a/unicode_names_macros/tests/test.rs b/unicode_names2_macros/tests/test.rs similarity index 90% rename from unicode_names_macros/tests/test.rs rename to unicode_names2_macros/tests/test.rs index 6bb9142..f63bb9b 100755 --- a/unicode_names_macros/tests/test.rs +++ b/unicode_names2_macros/tests/test.rs @@ -1,5 +1,5 @@ #![feature(plugin)] -#![plugin(unicode_names_macros)] +#![plugin(unicode_names2_macros)] #[test] fn named_char() { diff --git a/unicode_names_macros/Cargo.toml b/unicode_names_macros/Cargo.toml deleted file mode 100644 index 418a3f0..0000000 --- a/unicode_names_macros/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] - -name = "unicode_names_macros" -version = "0.1.5" -authors = ["Huon Wilson "] - -homepage = "https://github.com/huonw/unicode_names" -repository = "https://github.com/huonw/unicode_names" -documentation = "http://huonw.github.io/unicode_names/unicode_names/" -license = "MIT/Apache-2.0" -keywords = ["text", "unicode", "plugin"] -description = "Support macros for `unicode_names`." - -[features] -unstable = [] - -[dependencies] -regex = "0.1.8" -regex_macros = "0.1.2" - -[dependencies.unicode_names] -path = ".." -version = "0.1" - -[lib] -name = "unicode_names_macros" -plugin = true