Merge pull request #101 from adrienball/master

Use loose dependencies
garvys-org · Apr 27, 2020 · ca31b06 · ca31b06
2 parents 3eddc91 + 0081f1b
commit ca31b06
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fix olabel display while drawing a FST if no symbol table is provided
 - Fix computation of FstProperties. There was an issue with the ACYCLIC field.
+- Use loose dependencies
 
 ## [0.5.0] - 2020-02-04
 

diff --git a/rustfst/Cargo.toml b/rustfst/Cargo.toml
@@ -17,21 +17,20 @@ repository = 'https://github.com/Garvys/rustfst'
 edition = '2018'
 
 [dependencies]
-anyhow = '1.0'
-bimap = '0.3.1'
-binary-heap-plus = '0.1.4'
-bitflags = '1.0.4'
-generic-array = '0.12.0'
-itertools = '0.8'
-nom = '5.0'
+anyhow = '1'
+bimap = '0.3'
+binary-heap-plus = '0.1'
+bitflags = '1'
+generic-array = '0.12'
+itertools = '0.9'
+nom = '5'
 num-traits = '0.2'
 ordered-float = '1'
-serde = '1.0'
-serde_derive = '1.0'
-stable_bst = '0.2.0'
-superslice='1.0.0'
-typenum = '1.10.0'
-unsafe_unwrap = '0.1.0'
+serde = { version = '1', features = ['derive'] }
+stable_bst = '0.2'
+superslice ='1'
+typenum = '1.10'
+unsafe_unwrap = '0.1'
 
 [dev-dependencies]
 counter = '0.4'

diff --git a/rustfst/src/algorithms/compose/interval_set.rs b/rustfst/src/algorithms/compose/interval_set.rs
@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use std::collections::HashSet;
 use std::slice::Iter as IterSlice;
 use std::vec::IntoIter as IntoIterVec;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use superslice::Ext;
 use unsafe_unwrap::UnsafeUnwrap;
 

diff --git a/rustfst/src/tests_openfst/algorithms/arc_map.rs b/rustfst/src/tests_openfst/algorithms/arc_map.rs
@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use anyhow::Result;
 use pretty_assertions::assert_eq;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::arc_mappers::{
     IdentityArcMapper, InputEpsilonMapper, InvertWeightMapper, OutputEpsilonMapper, PlusMapper,

diff --git a/rustfst/src/tests_openfst/algorithms/closure.rs b/rustfst/src/tests_openfst/algorithms/closure.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{closure, ClosureFst, ClosureType};
 use crate::fst_impls::VectorFst;

diff --git a/rustfst/src/tests_openfst/algorithms/compose.rs b/rustfst/src/tests_openfst/algorithms/compose.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use anyhow::Result;
 use pretty_assertions::assert_eq;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::compose::compose_filters::{AltSequenceComposeFilter, ComposeFilter};
 use crate::algorithms::compose::lookahead_filters::lookahead_selector::SMatchOutput;

diff --git a/rustfst/src/tests_openfst/algorithms/concat.rs b/rustfst/src/tests_openfst/algorithms/concat.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{concat, ConcatFst};
 use crate::fst_impls::VectorFst;

diff --git a/rustfst/src/tests_openfst/algorithms/condense.rs b/rustfst/src/tests_openfst/algorithms/condense.rs
@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use anyhow::Result;
 use itertools::Itertools;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::condense;
 use crate::fst_traits::{MutableFst, SerializableFst};

diff --git a/rustfst/src/tests_openfst/algorithms/encode.rs b/rustfst/src/tests_openfst/algorithms/encode.rs
@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use anyhow::{format_err, Result, Context};
 use pretty_assertions::assert_eq;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{decode, encode};
 use crate::fst_properties::FstProperties;

diff --git a/rustfst/src/tests_openfst/algorithms/factor_weight_gallic.rs b/rustfst/src/tests_openfst/algorithms/factor_weight_gallic.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::factor_iterators::GallicFactor;
 use crate::algorithms::factor_iterators::GallicFactorLeft;

diff --git a/rustfst/src/tests_openfst/algorithms/factor_weight_identity.rs b/rustfst/src/tests_openfst/algorithms/factor_weight_identity.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::factor_iterators::IdentityFactor;
 use crate::algorithms::factor_weight;

diff --git a/rustfst/src/tests_openfst/algorithms/gallic_encode_decode.rs b/rustfst/src/tests_openfst/algorithms/gallic_encode_decode.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::weight_convert;
 use crate::algorithms::weight_converters::FromGallicConverter;

diff --git a/rustfst/src/tests_openfst/algorithms/label_reachable.rs b/rustfst/src/tests_openfst/algorithms/label_reachable.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::compose::lookahead_matchers::LabelLookAheadMatcher;
 use crate::algorithms::compose::matchers::SortedMatcher;

diff --git a/rustfst/src/tests_openfst/algorithms/minimize.rs b/rustfst/src/tests_openfst/algorithms/minimize.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use anyhow::{format_err, Result};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::minimize;
 use crate::fst_traits::{AllocableFst, MutableFst, SerializableFst};

diff --git a/rustfst/src/tests_openfst/algorithms/push.rs b/rustfst/src/tests_openfst/algorithms/push.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{push, PushType, ReweightType};
 use crate::fst_impls::VectorFst;

diff --git a/rustfst/src/tests_openfst/algorithms/shortest_distance.rs b/rustfst/src/tests_openfst/algorithms/shortest_distance.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::shortest_distance;
 use crate::fst_traits::{MutableFst, SerializableFst};

diff --git a/rustfst/src/tests_openfst/algorithms/shortest_path.rs b/rustfst/src/tests_openfst/algorithms/shortest_path.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use anyhow::{format_err, Result};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{isomorphic, shortest_path};
 use crate::fst_traits::{CoreFst, MutableFst, SerializableFst};

diff --git a/rustfst/src/tests_openfst/algorithms/state_reachable.rs b/rustfst/src/tests_openfst/algorithms/state_reachable.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::compose::StateReachable;
 use crate::fst_traits::{MutableFst, SerializableFst};

diff --git a/rustfst/src/tests_openfst/algorithms/union.rs b/rustfst/src/tests_openfst/algorithms/union.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::algorithms::{union, UnionFst};
 use crate::fst_impls::VectorFst;

diff --git a/rustfst/src/tests_openfst/mod.rs b/rustfst/src/tests_openfst/mod.rs
@@ -10,7 +10,7 @@ use anyhow::{bail, Result};
 use path_abs::PathAbs;
 use path_abs::PathInfo;
 use path_abs::PathMut;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::fst_impls::VectorFst;
 use crate::fst_properties::FstProperties;

diff --git a/rustfst/src/tests_openfst/test_symt.rs b/rustfst/src/tests_openfst/test_symt.rs
@@ -1,7 +1,7 @@
 use std::fs::read_to_string;
 
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::SymbolTable;
 

diff --git a/rustfst/src/tests_openfst/test_weights.rs b/rustfst/src/tests_openfst/test_weights.rs
@@ -1,7 +1,7 @@
 use std::fs::read_to_string;
 
 use anyhow::Result;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::semirings::{
     GallicWeight, GallicWeightLeft, GallicWeightMin, GallicWeightRestrict, GallicWeightRight,