Update

Author: alexander-irbis

.travis.yml

@@ -40,7 +40,7 @@ env:
   - DEADLINKS_VERS=0.3.0
   - RUSTFLAGS="-C link-dead-code"
   - RUST_LOG=off
-  - TARPAULIN_VERS=0.6.8
+  - TARPAULIN_VERS=0.7.0
 
 install:
 - cargo install --list
@@ -52,7 +52,7 @@ script: skip
 jobs:
   include:
   - stage: test
-    rust: 1.27.0
+    rust: 1.31.0
     script:
     - cargo test --verbose --all -- --test-threads=1
 
@@ -106,7 +106,7 @@ jobs:
     - cargo clippy -- -D warnings
 
   - stage: quality
-    rust: nightly-2018-11-18
+    rust: nightly-2019-01-29
     env:
     - FEATURE=cov
     install:

Cargo.toml

@@ -10,6 +10,7 @@ readme = "README.md"
 homepage = "https://github.com/irbis-labs/rsmorphy"
 repository = "https://github.com/irbis-labs/rsmorphy"
 documentation = "https://docs.rs/rsmorphy/"
+edition = "2018"
 publish = true
 
 [badges]
@@ -41,9 +42,10 @@ serde               = "1.0"
 serde_derive        = "1.0"
 serde_json          = "1.0"
 string_cache        = "0.7"
-unicode_categories  = "0.1"
+uc                  = { version = "0.1", package = "unicode_categories" }
 
-rsmorphy-dict-ru    = { version = "0.1", path = "./dict/ru" }
+dict-ru             = { version = "0.1", package = "rsmorphy-dict-ru", path = "./dict/ru" }
+#dict-uk             = { version = "0.1", package = "rsmorphy-dict-uk", path = "./dict/uk" }
 
 
 [dev-dependencies]

README.md

@@ -3,8 +3,8 @@
 
 [![Build Status](https://travis-ci.org/irbis-labs/rsmorphy.svg)](https://travis-ci.org/irbis-labs/rsmorphy)
 [![Coverage Status](https://coveralls.io/repos/github/irbis-labs/rsmorphy/badge.svg?branch=master)](https://coveralls.io/github/irbis-labs/rsmorphy?branch=master)
-![Minimal rust version 1.27](https://img.shields.io/badge/rustc-1.27+-green.svg)
-![Nightly rust version from August 25, 2018](https://img.shields.io/badge/rustc-nightly_2018--08--25-yellow.svg)
+![Minimal rust version 1.32](https://img.shields.io/badge/rustc-1.32+-green.svg)
+![Nightly rust version from August 25, 2018](https://img.shields.io/badge/rustc-nightly_2019--01--29-yellow.svg)
 
 [![Join the chat at https://gitter.im/rsmorphy/Lobby](https://badges.gitter.im/rsmorphy/Lobby.svg)](https://gitter.im/rsmorphy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Waffle.io - Columns and their card count](https://badge.waffle.io/irbis-labs/rsmorphy.svg?columns=inbox,backlog,in%20progress,done)](https://waffle.io/irbis-labs/rsmorphy)

dict/ru/build.rs

@@ -11,19 +11,7 @@ fn main() -> io::Result<()> {
     let mut f = File::create("src/release.rs")
         .expect("Can't create a file");
 
-    let res = Command::new("rustc")
-        .arg("--version")
-        .output()
-        .expect("Can't get rustc version");
-
-    let version = from_utf8(&res.stdout)
-        .expect("Can't convert from utf-8");
-
-    writeln!(f, r"pub static RUSTC_VERSION: &str = {:?};", version)
-        .expect("Can't write to a file");
-
-    writeln!(f, r"pub const DICT_PATH: &str = {:?};", dict_path)
-        .expect("Can't write to a file");
+    writeln!(f, r"pub const DICT_PATH: &str = {:?};", dict_path)?;
 
     Ok(())
 }

examples/enc-dec.rs

@@ -1,10 +1,11 @@
 extern crate rsmorphy;
 
-use rsmorphy::{prelude::*, rsmorphy_dict_ru};
+use dict_ru;
+use rsmorphy::prelude::*;
 
 pub mod util;
 
-use util::print_row_parsed;
+use crate::util::print_row_parsed;
 
 fn table(morph: &MorphAnalyzer, s: &str) {
     for (i, parsed) in morph.parse(s).into_iter().enumerate() {
@@ -22,7 +23,7 @@ fn table(morph: &MorphAnalyzer, s: &str) {
 }
 
 fn main() {
-    let morph_ru = MorphAnalyzer::from_file(rsmorphy_dict_ru::DICT_PATH);
+    let morph_ru = MorphAnalyzer::from_file(dict_ru::DICT_PATH);
 
     //    table(&morph_ru, "яблоко");
     //    table(&morph_ru, "хлеб");

examples/inflect.rs

@@ -1,13 +1,14 @@
 extern crate rsmorphy;
 
-use rsmorphy::{prelude::*, rsmorphy_dict_ru};
+use dict_ru;
+use rsmorphy::prelude::*;
 
 pub mod util;
 
 //use util::print_row_lex;
 
 fn main() {
-    let morph_ru = MorphAnalyzer::from_file(rsmorphy_dict_ru::DICT_PATH);
+    let morph_ru = MorphAnalyzer::from_file(dict_ru::DICT_PATH);
 
     //let lex = Lex::from_id(&morph_ru, "ru:d:стали,388,4").unwrap();
     //print_row_lex(&morph_ru, 0, &lex.inflect(&morph_ru, &GrammemeSet::from_str("plur,ablt")).unwrap());

examples/lexeme.rs

@@ -3,11 +3,12 @@ extern crate rsmorphy;
 use std::collections::BTreeSet;
 use std::iter::FromIterator;
 
-use rsmorphy::{prelude::*, rsmorphy_dict_ru};
+use dict_ru;
+use rsmorphy::prelude::*;
 
 pub mod util;
 
-use util::{input_loop, print_row_lex};
+use crate::util::{input_loop, print_row_lex};
 
 fn print_lexeme(morph: &MorphAnalyzer, lex: &Lex) {
     for (i, lex) in lex.iter_lexeme(morph).enumerate() {
@@ -30,7 +31,7 @@ fn list(morph: &MorphAnalyzer, s: &str) {
 }
 
 fn main() {
-    let morph_ru = MorphAnalyzer::from_file(rsmorphy_dict_ru::DICT_PATH);
+    let morph_ru = MorphAnalyzer::from_file(dict_ru::DICT_PATH);
 
     input_loop(|word| list(&morph_ru, word));
 }

examples/parse.rs

@@ -1,11 +1,12 @@
 //extern crate rustyline;
 extern crate rsmorphy;
 
-use rsmorphy::{prelude::*, rsmorphy_dict_ru};
+use dict_ru;
+use rsmorphy::prelude::*;
 
 pub mod util;
 
-use util::{input_loop, print_row_parsed};
+use crate::util::{input_loop, print_row_parsed};
 
 fn table(morph: &MorphAnalyzer, s: &str) {
     for (i, parsed) in morph.parse(s).into_iter().enumerate() {
@@ -14,7 +15,7 @@ fn table(morph: &MorphAnalyzer, s: &str) {
 }
 
 fn main() {
-    let morph_ru = MorphAnalyzer::from_file(rsmorphy_dict_ru::DICT_PATH);
+    let morph_ru = MorphAnalyzer::from_file(dict_ru::DICT_PATH);
 
     input_loop(|word| table(&morph_ru, word))
 }

src/analyzer/morph.rs

@@ -1,10 +1,11 @@
 use std::path::Path;
 
-use container::{ParseResult, SeenSet};
-use opencorpora::dictionary::Dictionary;
-
-use analyzer::units::*;
-use estimator::SingleTagProbabilityEstimator;
+use crate::{
+    analyzer::units::*,
+    container::{ParseResult, SeenSet},
+    estimator::SingleTagProbabilityEstimator,
+    opencorpora::dictionary::Dictionary,
+};
 
 #[derive(Debug, Default, Clone)]
 pub struct Units {
@@ -107,10 +108,11 @@ impl MorphAnalyzer {
 #[cfg(test)]
 mod tests {
     use env_logger;
-    use {rsmorphy_dict_ru, MorphAnalyzer};
 
-    lazy_static! {
-        static ref RU: MorphAnalyzer = MorphAnalyzer::from_file(rsmorphy_dict_ru::DICT_PATH);
+    use crate::MorphAnalyzer;
+
+    lazy_static::lazy_static! {
+        static ref RU: MorphAnalyzer = MorphAnalyzer::from_file(dict_ru::DICT_PATH);
     }
 
     #[test]

src/analyzer/units/abbr/initials.rs

@@ -1,16 +1,14 @@
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-use std::iter::FromIterator;
+use std::{borrow::Cow, collections::BTreeSet, iter::FromIterator};
 
-use analyzer::units::abc::AnalyzerUnit;
-use analyzer::MorphAnalyzer;
-use container::stack::StackSource;
-use container::{Initials, InitialsKind};
-use container::{Lex, Score};
-use container::{ParseResult, Parsed, SeenSet};
-use opencorpora::OpencorporaTagReg;
+use crate::{
+    analyzer::{units::abc::AnalyzerUnit, MorphAnalyzer},
+    container::{
+        stack::StackSource, Initials, InitialsKind, Lex, ParseResult, Parsed, Score, SeenSet,
+    },
+    opencorpora::OpencorporaTagReg,
+};
 
-lazy_static! {
+lazy_static::lazy_static! {
     #[derive(Debug)]
     pub static ref LETTERS: BTreeSet<&'static str> = {
         let set = "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЭЮЯ".split("").filter(|v| !v.is_empty());
@@ -63,13 +61,13 @@ impl AnalyzerUnit for InitialsAnalyzer {
         word_lower: &str,
         _seen_parses: &mut SeenSet,
     ) {
-        trace!("AbbreviatedFirstNameAnalyzer::parse()");
-        trace!(r#" word: "{}", word_lower: "{}" "#, word, word_lower);
-        trace!(
+        log::trace!("AbbreviatedFirstNameAnalyzer::parse()");
+        log::trace!(r#" word: "{}", word_lower: "{}" "#, word, word_lower);
+        log::trace!(
             r#" LETTERS: "{:?}" "#,
             LETTERS.iter().cloned().collect::<Vec<&str>>().join(", ")
         );
-        trace!(r#" LETTERS contains word: "{}" "#, LETTERS.contains(word));
+        log::trace!(r#" LETTERS contains word: "{}" "#, LETTERS.contains(word));
 
         if let Some(&letter) = LETTERS.get(word) {
             for (tag_idx, &(_, kind)) in self.tags.iter().enumerate() {