Merge pull request #38 from snipsco/hotfix/license-info

[hotfix-0.7.2] Make LicenseInfo public

Author: adrienball

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.7.2]
+### Fixed
+- Make `LicenseInfo` public [#38](https://github.com/snipsco/gazetteer-entity-parser/pull/38)
+
 ## [0.7.1]
 ### Added
 - Add a license file to the gazetteer entity parser [#36](https://github.com/snipsco/gazetteer-entity-parser/pull/36)
@@ -23,6 +27,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Clearer `ParserBuilder`'s API 
 
+[0.7.2]: https://github.com/snipsco/gazetteer-entity-parser/compare/0.7.1...0.7.2
 [0.7.1]: https://github.com/snipsco/gazetteer-entity-parser/compare/0.7.0...0.7.1
 [0.7.0]: https://github.com/snipsco/gazetteer-entity-parser/compare/0.6.0...0.7.0
 [0.6.0]: https://github.com/snipsco/gazetteer-entity-parser/compare/0.5.1...0.6.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gazetteer-entity-parser"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Alaa Saade <[email protected]>"]
 
 [profile.bench]
@@ -16,10 +16,10 @@ fnv = "1.0"
 
 [dev-dependencies]
 criterion = "0.2"
-dinghy-test = "0.3"
-rand = "0.5"
+dinghy-test = "0.4"
+rand = "0.7"
 tempfile = "3"
-mio_httpc = {version = "0.6", features = ["rtls"]}
+mio_httpc = {version = "0.8", features = ["rtls"]}
 clap = "2"
 
 [[bench]]

benches/bench_parser.rs

@@ -5,23 +5,21 @@ extern crate gazetteer_entity_parser;
 extern crate rand;
 extern crate serde_json;
 
-use std::collections::HashSet;
-
 use criterion::Criterion;
+use gazetteer_entity_parser::*;
 use rand::distributions::Alphanumeric;
-use rand::seq::sample_iter;
+use rand::rngs::ThreadRng;
+use rand::seq::IteratorRandom;
 use rand::thread_rng;
 use rand::Rng;
-
-use gazetteer_entity_parser::*;
+use std::collections::HashSet;
 
 pub fn test_data_path() -> ::std::path::PathBuf {
-    ::dinghy_test::try_test_file_path("data")
-        .unwrap_or_else(|| "data".into())
+    ::dinghy_test::try_test_file_path("data").unwrap_or_else(|| "data".into())
 }
 
 /// Function generating a random string representing a single word of various length
-fn generate_random_string(rng: &mut rand::ThreadRng) -> String {
+fn generate_random_string(rng: &mut ThreadRng) -> String {
     let n_char = rng.gen_range(3, 8);
     rng.sample_iter(&Alphanumeric).take(n_char).collect()
 }
@@ -31,7 +29,7 @@ fn generate_random_string(rng: &mut rand::ThreadRng) -> String {
 struct RandomStringGenerator {
     vocabulary: Vec<String>,
     max_words: usize,
-    rng: rand::ThreadRng,
+    rng: ThreadRng,
     already_generated: HashSet<String>,
 }
 
@@ -56,8 +54,10 @@ impl Iterator for RandomStringGenerator {
     fn next(&mut self) -> Option<String> {
         loop {
             let n_words = self.rng.gen_range(1, self.max_words);
-            let generated_value = sample_iter(&mut self.rng, self.vocabulary.iter(), n_words)
-                .unwrap()
+            let generated_value = self
+                .vocabulary
+                .iter()
+                .choose_multiple(&mut self.rng, n_words)
                 .iter()
                 .map(|sample_string| sample_string.to_string())
                 .collect::<Vec<_>>()
@@ -84,7 +84,9 @@ fn generate_random_gazetteer(
             raw_value: string,
         })
         .collect();
-    let gazetteer = Gazetteer { data: entity_values };
+    let gazetteer = Gazetteer {
+        data: entity_values,
+    };
     (gazetteer, rsg)
 }
 
@@ -140,10 +142,16 @@ fn loading(c: &mut Criterion) {
 
         parser.dump(&parser_directory).unwrap();
     }
-    c.bench_function("Loading random gazetteer parser with low redundancy", move |b| {
-        b.iter(|| Parser::from_folder(parser_directory.clone()).unwrap())
-    });
+    c.bench_function(
+        "Loading random gazetteer parser with low redundancy",
+        move |b| b.iter(|| Parser::from_folder(parser_directory.clone()).unwrap()),
+    );
 }
 
-criterion_group!(benches, parsing_low_redundancy, parsing_high_redundancy, loading);
+criterion_group!(
+    benches,
+    parsing_low_redundancy,
+    parsing_high_redundancy,
+    loading
+);
 criterion_main!(benches);

src/lib.rs

@@ -88,7 +88,7 @@ mod parser_builder;
 mod symbol_table;
 mod utils;
 
-pub use data::{EntityValue, Gazetteer};
-pub use parser::{ParsedValue, Parser};
-pub use parser_builder::ParserBuilder;
+pub use data::*;
+pub use parser::*;
+pub use parser_builder::*;
 pub mod errors;

update_version.sh

@@ -4,21 +4,15 @@ set -e
 
 NEW_VERSION=$1
 
-if [ -z $NEW_VERSION ]; then
+if [[ -z ${NEW_VERSION} ]]; then
     echo "Usage: $0 NEW_VERSION"
     exit 1
 fi
 
 SPLIT_VERSION=( ${NEW_VERSION//./ } )
-if [ ${#SPLIT_VERSION[@]} -ne 3 ]; then
+if [[ ${#SPLIT_VERSION[@]} -ne 3 ]]; then
   echo "Version number is invalid (must be of the form x.y.z)"
   exit 1
 fi
 
-let SPLIT_VERSION[1]+=1
-NEXT_NEW_VERSION="${SPLIT_VERSION[0]}.${SPLIT_VERSION[1]}.${SPLIT_VERSION[2]}"
-
-echo "REAL VERSION $NEW_VERSION"
-echo "NEXT VERSION $NEXT_NEW_VERSION"
-
 perl -p -i -e "s/^version = \".*\"\$/version = \"$NEW_VERSION\"/g" Cargo.toml