Update Lindera to 0.12.0 (#41)

* Update Lindera to 0.12.0 * Update CHANGES.md * Fix lint * Update README.md
lindera · Mar 17, 2022 · 22a1fcb · 22a1fcb
1 parent d2c45c7
commit 22a1fcb
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 24 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.12.0 (2022-03-17)
+- Update Lindera to 0.12.0 #41 @mosuka
+
 ## 0.11.1 (2022-03-09)
 - Update Lindera and Tantivy #37 @mosuka
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lindera-tantivy"
-version = "0.11.1"
+version = "0.12.0"
 edition = "2021"
 description = "Lindera Tokenizer for Tantivy."
 documentation = "https://docs.rs/lindera-tantivy"
@@ -22,8 +22,7 @@ cc-cedict = ["lindera/cc-cedict"]  # Chinese dictionary
 [dependencies]
 tantivy = "0.17"
 
-lindera = "0.11.1"
-lindera-core = "0.11.1"
+lindera = "0.12.0"
 
 [dev-dependencies]
 criterion = "0.3"

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ The following example enables IPADIC.
 
 ```
 [dependencies]
-lindera = { version = "0.11.1", features = ["ipadic"] }
+lindera-tantivy = { version = "0.12.0", features = ["ipadic"] }
 ```
 
 - ipadic: Japanese dictionary
@@ -27,10 +27,11 @@ lindera = { version = "0.11.1", features = ["ipadic"] }
 use tantivy::collector::TopDocs;
 use tantivy::query::QueryParser;
 use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
-use tantivy::{doc, Index};
+use tantivy::doc;
+use tantivy::Index;
 
-use lindera::tokenizer::{TokenizerConfig, UserDictionaryType, DictionaryType};
-use lindera_core::viterbi::{Mode, Penalty};
+use lindera::mode::{Mode, Penalty};
+use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
 use lindera_tantivy::tokenizer::LinderaTokenizer;
 
 fn main() -> tantivy::Result<()> {

diff --git a/benches/bench.rs b/benches/bench.rs
@@ -4,14 +4,11 @@ use criterion::{criterion_group, criterion_main};
 #[cfg(feature = "ipadic")]
 fn bench_indexing(c: &mut Criterion) {
     use tantivy::doc;
-    use tantivy::schema::IndexRecordOption;
-    use tantivy::schema::Schema;
-    use tantivy::schema::TextFieldIndexing;
-    use tantivy::schema::TextOptions;
+    use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
     use tantivy::Index;
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::{Mode, Penalty};
     use lindera_tantivy::tokenizer::LinderaTokenizer;
 
     // create schema builder

diff --git a/examples/cc-cedict_example.rs b/examples/cc-cedict_example.rs
@@ -1,12 +1,13 @@
 #[cfg(feature = "cc-cedict")]
 fn main() -> tantivy::Result<()> {
     use tantivy::collector::TopDocs;
+    use tantivy::doc;
     use tantivy::query::QueryParser;
     use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
-    use tantivy::{doc, Index};
+    use tantivy::Index;
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::{Mode, Penalty};
     use lindera_tantivy::tokenizer::LinderaTokenizer;
 
     // create schema builder

diff --git a/examples/ipadic_example.rs b/examples/ipadic_example.rs
@@ -1,12 +1,13 @@
 #[cfg(feature = "ipadic")]
 fn main() -> tantivy::Result<()> {
     use tantivy::collector::TopDocs;
+    use tantivy::doc;
     use tantivy::query::QueryParser;
     use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
-    use tantivy::{doc, Index};
+    use tantivy::Index;
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::{Mode, Penalty};
     use lindera_tantivy::tokenizer::LinderaTokenizer;
 
     // create schema builder

diff --git a/examples/ko-dic_example.rs b/examples/ko-dic_example.rs
@@ -1,12 +1,13 @@
 #[cfg(feature = "ko-dic")]
 fn main() -> tantivy::Result<()> {
     use tantivy::collector::TopDocs;
+    use tantivy::doc;
     use tantivy::query::QueryParser;
     use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
-    use tantivy::{doc, Index};
+    use tantivy::Index;
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::{Mode, Penalty};
     use lindera_tantivy::tokenizer::LinderaTokenizer;
 
     // create schema builder

diff --git a/examples/unidic_example.rs b/examples/unidic_example.rs
@@ -1,12 +1,13 @@
 #[cfg(feature = "unidic")]
 fn main() -> tantivy::Result<()> {
     use tantivy::collector::TopDocs;
+    use tantivy::doc;
     use tantivy::query::QueryParser;
     use tantivy::schema::{IndexRecordOption, Schema, TextFieldIndexing, TextOptions};
-    use tantivy::{doc, Index};
+    use tantivy::Index;
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::{Mode, Penalty};
     use lindera_tantivy::tokenizer::LinderaTokenizer;
 
     // create schema builder

diff --git a/src/stream.rs b/src/stream.rs
@@ -1,6 +1,7 @@
-use lindera::tokenizer::Token as LToken;
 use tantivy::tokenizer::{Token, TokenStream};
 
+use lindera::tokenizer::Token as LToken;
+
 pub struct LinderaTokenStream<'a> {
     pub result: Vec<LToken<'a>>,
     pub index: usize,

diff --git a/src/tokenizer.rs b/src/tokenizer.rs
@@ -1,7 +1,7 @@
 use tantivy::tokenizer::{BoxTokenStream, Tokenizer};
 
 use lindera::tokenizer::{Tokenizer as LTokenizer, TokenizerConfig};
-use lindera_core::LinderaResult;
+use lindera::LinderaResult;
 
 use crate::stream::LinderaTokenStream;
 
@@ -53,9 +53,8 @@ impl Tokenizer for LinderaTokenizer {
 mod tests {
     use tantivy::tokenizer::{BoxTokenStream, Token, Tokenizer};
 
+    use lindera::mode::{Mode, Penalty};
     use lindera::tokenizer::{DictionaryType, TokenizerConfig, UserDictionaryType};
-    use lindera_core::viterbi::Mode;
-    use lindera_core::viterbi::Penalty;
 
     use crate::tokenizer::LinderaTokenizer;