Merge branch 'release-v0.7.11' into release

rust-phf · Jan 13, 2016 · 7260d04 · 7260d04
2 parents 25cea13 + a004227
commit 7260d04
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 28 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Steven Fackler
+Copyright (c) 2014-2016 Steven Fackler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

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.10/phf)
+[Documentation](https://sfackler.github.io/rust-phf/doc/v0.7.11/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.10"
+version = "0.7.11"
 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.10/phf"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.11/phf"
 
 [lib]
 name = "phf"
@@ -16,4 +16,4 @@ test = false
 core = ["phf_shared/core"]
 
 [dependencies]
-phf_shared = { version = "=0.7.10", path = "../phf_shared" }
+phf_shared = { version = "=0.7.11", 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.10")]
+#![doc(html_root_url="https://sfackler.github.io/rust-phf/doc/v0.7.11")]
 #![warn(missing_docs)]
 #![cfg_attr(feature = "core", feature(no_std, core_slice_ext))]
 #![cfg_attr(feature = "core", no_std)]

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.10"
+version = "0.7.11"
 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.10/phf_codegen"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.11/phf_codegen"
 
 [dependencies.phf_generator]
 path = "../phf_generator"
-version = "=0.7.10"
+version = "=0.7.11"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.10"
+version = "=0.7.11"
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.10")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.11")]
 extern crate phf_shared;
 extern crate phf_generator;
 

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.10"
+version = "0.7.11"
 license = "MIT"
 description = "PHF generation logic"
 repository = "https://github.com/sfackler/rust-phf"
-documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.10/phf_generator"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.11/phf_generator"
 
 [dependencies]
 rand = "0.3"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.10"
+version = "=0.7.11"
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.10")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.11")]
 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.10"
+version = "0.7.11"
 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.10/phf_macros"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.11/phf_macros"
 
 [lib]
 name = "phf_macros"
@@ -18,16 +18,16 @@ stats = ["time"]
 
 [dependencies.phf_generator]
 path = "../phf_generator"
-version = "=0.7.10"
+version = "=0.7.11"
 
 [dependencies.phf_shared]
 path = "../phf_shared"
-version = "=0.7.10"
+version = "=0.7.11"
 
 [dependencies.time]
 version = "0.1"
 optional = true
 
 [dev-dependencies.phf]
 path = "../phf"
-version = "=0.7.10"
+version = "=0.7.11"
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.10")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.11")]
 #![feature(plugin_registrar, quote, rustc_private)]
 
 extern crate syntax;
@@ -81,7 +81,9 @@ fn generate_hash(cx: &mut ExtCtxt, sp: Span, entries: &[Entry]) -> HashState {
     let time = precise_time_s() - start;
 
     if cfg!(feature = "stats") && env::var_os("PHF_STATS").is_some() {
-        cx.span_warn(sp, &format!("PHF generation took {} seconds", time));
+        cx.parse_sess
+          .span_diagnostic
+          .span_note_without_error(sp, &format!("PHF generation took {} seconds", time));
     }
 
     state
@@ -165,7 +167,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             Key::Str(InternedString::new(""))
         });
 
-        if !parser.eat(&FatArrow).ok().unwrap() {
+        if !parser.eat(&FatArrow) {
             cx.span_err(parser.span, "expected `=>`");
             return None;
         }
@@ -178,7 +180,7 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             value: value,
         });
 
-        if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof {
+        if !parser.eat(&Comma) && parser.token != Eof {
             cx.span_err(parser.span, "expected `,`");
             return None;
         }
@@ -210,7 +212,7 @@ fn parse_set(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
             value: value.clone(),
         });
 
-        if !parser.eat(&Comma).ok().unwrap() && parser.token != Eof {
+        if !parser.eat(&Comma) && parser.token != Eof {
             cx.span_err(parser.span, "expected `,`");
             return None;
         }

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.10"
+version = "0.7.11"
 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.10/phf_shared"
+documentation = "https://sfackler.github.io/rust-phf/doc/v0.7.11/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.10")]
+#![doc(html_root_url="http://sfackler.github.io/rust-phf/doc/v0.7.11")]
 #![cfg_attr(feature = "core", feature(no_std, core_slice_ext, core_str_ext))]
 #![cfg_attr(feature = "core", no_std)]
 #[cfg(not(feature = "core"))]