Merge branch 'release-v0.7.15' into release

rust-phf · May 26, 2016 · 6bbc9e2 · 6bbc9e2
2 parents ea8dd65 + 20f896e
commit 6bbc9e2
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Rust-PHF
 
 [![Build Status](https://travis-ci.org/sfackler/rust-phf.png?branch=master)](https://travis-ci.org/sfackler/rust-phf) [![Latest Version](https://img.shields.io/crates/v/phf.svg)](https://crates.io/crates/phf)
 
-[Documentation](https://sfackler.github.io/rust-phf/doc/v0.7.14/phf)
+[Documentation](https://sfackler.github.io/rust-phf/doc/v0.7.15/phf)
 
 Rust-PHF is a library to generate efficient lookup tables at compile time using
 [perfect hash functions](http://en.wikipedia.org/wiki/Perfect_hash_function).

diff --git a/phf/Cargo.toml b/phf/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "phf"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-version = "0.7.14"
+version = "0.7.15"
 license = "MIT"
 description = "Runtime support for perfect hash function data structures"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf"
 
 [lib]
 name = "phf"
@@ -17,4 +17,4 @@ core = ["phf_shared/core"]
 unicase = ["phf_shared/unicase"]
 
 [dependencies]
-phf_shared = { version = "=0.7.14", path = "../phf_shared" }
+phf_shared = { version = "=0.7.15", path = "../phf_shared" }
diff --git a/phf/src/lib.rs b/phf/src/lib.rs
@@ -3,7 +3,7 @@
 //! PHF data structures can be generated via the syntax extensions in the
 //! `phf_macros` crate or via code generation in the `phf_codegen` crate. See
 //! the documentation of those crates for more details.
-#![doc(html_root_url="https://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="https://sfackler.github.io/rust-phf/doc/v0.7.15")]
 #![warn(missing_docs)]
 #![cfg_attr(feature = "core", no_std)]
 

diff --git a/phf_builder/Cargo.toml b/phf_builder/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "phf_builder"
-version = "0.7.14"
+version = "0.7.15"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "MIT"
 description = "Runtime creation of perfect hash function data structures"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf_builder"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf_builder"
 
 [dependencies]
-phf = { version = "=0.7.14", path = "../phf" }
-phf_generator = { version = "=0.7.14", path = "../phf_generator" }
+phf = { version = "=0.7.15", path = "../phf" }
+phf_generator = { version = "=0.7.15", path = "../phf_generator" }
diff --git a/phf_builder/src/lib.rs b/phf_builder/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.15")]
 extern crate phf;
 extern crate phf_generator;
 
@@ -51,7 +51,7 @@ impl<K: Hash + PhfHash + Eq, V> Map<K, V> {
         let mut entries = self.keys
                               .into_iter()
                               .zip(self.values)
-                              .map(Option::Some)
+                              .map(Some)
                               .collect::<Vec<_>>();
         let entries = state.map
                            .iter()

diff --git a/phf_codegen/Cargo.toml b/phf_codegen/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "phf_codegen"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-version = "0.7.14"
+version = "0.7.15"
 license = "MIT"
 description = "Codegen library for PHF types"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf_codegen"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf_codegen"
 
 [dependencies.phf_generator]
 path = "../phf_generator"
-version = "=0.7.14"
+version = "=0.7.15"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.14"
+version = "=0.7.15"
diff --git a/phf_codegen/src/lib.rs b/phf_codegen/src/lib.rs
@@ -78,7 +78,7 @@
 //! builder.entry("world", "2");
 //! // ...
 //! ```
-#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.15")]
 extern crate phf_shared;
 extern crate phf_generator;
 
@@ -93,6 +93,7 @@ use std::io::prelude::*;
 pub struct Map<K> {
     keys: Vec<K>,
     values: Vec<String>,
+    path: String,
 }
 
 impl<K: Hash+PhfHash+Eq+fmt::Debug> Map<K> {
@@ -112,15 +113,22 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> Map<K> {
         Map {
             keys: vec![],
             values: vec![],
+            path: String::from("::phf"),
         }
     }
 
+    /// Set the path to the `phf` crate from the global namespace
+    pub fn phf_path(&mut self, path: &str) -> &mut Map<K> {
+        self.path = path.to_owned();
+        self
+    }
+
     /// Adds an entry to the builder.
     ///
     /// `value` will be written exactly as provided in the constructed source.
     pub fn entry(&mut self, key: K, value: &str) -> &mut Map<K> {
         self.keys.push(key);
-        self.values.push(value.to_string());
+        self.values.push(value.to_owned());
         self
     }
 
@@ -140,10 +148,10 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> Map<K> {
         let state = phf_generator::generate_hash(&self.keys);
 
         try!(write!(w,
-                    "::phf::Map {{
+                    "{}::Map {{
     key: {},
-    disps: ::phf::Slice::Static(&[",
-                    state.key));
+    disps: {}::Slice::Static(&[",
+                    self.path, state.key, self.path));
         for &(d1, d2) in &state.disps {
             try!(write!(w,
                         "
@@ -154,7 +162,7 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> Map<K> {
         try!(write!(w,
                     "
     ]),
-    entries: ::phf::Slice::Static(&["));
+    entries: {}::Slice::Static(&[", self.path));
         for &idx in &state.map {
             try!(write!(w,
                         "
@@ -177,7 +185,15 @@ pub struct Set<T> {
 impl<T: Hash+PhfHash+Eq+fmt::Debug> Set<T> {
     /// Constructs a new `phf::Set` builder.
     pub fn new() -> Set<T> {
-        Set { map: Map::new() }
+        Set {
+            map: Map::new(),
+        }
+    }
+
+    /// Set the path to the `phf` crate from the global namespace
+    pub fn phf_path(&mut self, path: &str) -> &mut Set<T> {
+        self.map.phf_path(path);
+        self
     }
 
     /// Adds an entry to the builder.
@@ -192,7 +208,7 @@ impl<T: Hash+PhfHash+Eq+fmt::Debug> Set<T> {
     ///
     /// Panics if there are any duplicate entries.
     pub fn build<W: Write>(&self, w: &mut W) -> io::Result<()> {
-        try!(write!(w, "::phf::Set {{ map: "));
+        try!(write!(w, "{}::Set {{ map: ", self.map.path));
         try!(self.map.build(w));
         write!(w, " }}")
     }
@@ -202,6 +218,7 @@ impl<T: Hash+PhfHash+Eq+fmt::Debug> Set<T> {
 pub struct OrderedMap<K> {
     keys: Vec<K>,
     values: Vec<String>,
+    path: String,
 }
 
 impl<K: Hash+PhfHash+Eq+fmt::Debug> OrderedMap<K> {
@@ -210,15 +227,22 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> OrderedMap<K> {
         OrderedMap {
             keys: vec![],
             values: vec![],
+            path: String::from("::phf"),
         }
     }
 
+    /// Set the path to the `phf` crate from the global namespace
+    pub fn phf_path(&mut self, path: &str) -> &mut OrderedMap<K> {
+        self.path = path.to_owned();
+        self
+    }
+
     /// Adds an entry to the builder.
     ///
     /// `value` will be written exactly as provided in the constructed source.
     pub fn entry(&mut self, key: K, value: &str) -> &mut OrderedMap<K> {
         self.keys.push(key);
-        self.values.push(value.to_string());
+        self.values.push(value.to_owned());
         self
     }
 
@@ -239,10 +263,10 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> OrderedMap<K> {
         let state = phf_generator::generate_hash(&self.keys);
 
         try!(write!(w,
-                    "::phf::OrderedMap {{
+                    "{}::OrderedMap {{
     key: {},
-    disps: ::phf::Slice::Static(&[",
-                    state.key));
+    disps: {}::Slice::Static(&[",
+                    self.path, state.key, self.path));
         for &(d1, d2) in &state.disps {
             try!(write!(w,
                         "
@@ -253,7 +277,7 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> OrderedMap<K> {
         try!(write!(w,
                     "
     ]),
-    idxs: ::phf::Slice::Static(&["));
+    idxs: {}::Slice::Static(&[", self.path));
         for &idx in &state.map {
             try!(write!(w,
                         "
@@ -263,7 +287,7 @@ impl<K: Hash+PhfHash+Eq+fmt::Debug> OrderedMap<K> {
         try!(write!(w,
                     "
     ]),
-    entries: ::phf::Slice::Static(&["));
+    entries: {}::Slice::Static(&[", self.path));
         for (key, value) in self.keys.iter().zip(self.values.iter()) {
             try!(write!(w,
                         "
@@ -286,7 +310,15 @@ pub struct OrderedSet<T> {
 impl<T: Hash+PhfHash+Eq+fmt::Debug> OrderedSet<T> {
     /// Constructs a new `phf::OrderedSet` builder.
     pub fn new() -> OrderedSet<T> {
-        OrderedSet { map: OrderedMap::new() }
+        OrderedSet {
+            map: OrderedMap::new(),
+        }
+    }
+
+    /// Set the path to the `phf` crate from the global namespace
+    pub fn phf_path(&mut self, path: &str) -> &mut OrderedSet<T> {
+        self.map.phf_path(path);
+        self
     }
 
     /// Adds an entry to the builder.
@@ -302,7 +334,7 @@ impl<T: Hash+PhfHash+Eq+fmt::Debug> OrderedSet<T> {
     ///
     /// Panics if there are any duplicate entries.
     pub fn build<W: Write>(&self, w: &mut W) -> io::Result<()> {
-        try!(write!(w, "::phf::OrderedSet {{ map: "));
+        try!(write!(w, "{}::OrderedSet {{ map: ", self.map.path));
         try!(self.map.build(w));
         write!(w, " }}")
     }

diff --git a/phf_generator/Cargo.toml b/phf_generator/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "phf_generator"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-version = "0.7.14"
+version = "0.7.15"
 license = "MIT"
 description = "PHF generation logic"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf_generator"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf_generator"
 
 [dependencies]
 rand = "0.3"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.14"
+version = "=0.7.15"
diff --git a/phf_generator/src/lib.rs b/phf_generator/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.15")]
 extern crate phf_shared;
 extern crate rand;
 

diff --git a/phf_macros/Cargo.toml b/phf_macros/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "phf_macros"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-version = "0.7.14"
+version = "0.7.15"
 license = "MIT"
 description = "Compiler plugin for perfect hash function data structures"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf_macros"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf_macros"
 
 [lib]
 name = "phf_macros"
@@ -18,16 +18,16 @@ stats = ["time"]
 
 [dependencies.phf_generator]
 path = "../phf_generator"
-version = "=0.7.14"
+version = "=0.7.15"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.14"
+version = "=0.7.15"
 
 [dependencies.time]
 version = "0.1"
 optional = true
 
 [dev-dependencies.phf]
 path = "../phf"
-version = "=0.7.14"
+version = "=0.7.15"
diff --git a/phf_macros/src/lib.rs b/phf_macros/src/lib.rs
@@ -30,7 +30,7 @@
 //! }
 //! # fn main() {}
 //! ```
-#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.15")]
 #![feature(plugin_registrar, quote, rustc_private)]
 
 extern crate syntax;

diff --git a/phf_shared/Cargo.toml b/phf_shared/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "phf_shared"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-version = "0.7.14"
+version = "0.7.15"
 license = "MIT"
 description = "Support code shared by PHF libraries"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.14/phf_shared"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.15/phf_shared"
 
 [lib]
 name = "phf_shared"

diff --git a/phf_shared/src/lib.rs b/phf_shared/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.14")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.15")]
 #![cfg_attr(feature = "core", no_std)]
 #[cfg(not(feature = "core"))]
 extern crate std as core;