Migrate to Rust 2018 edition

Dentosal · Dentosal · commit 744c255fb9b8 · 2020-04-09T19:10:25.000+03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,8 @@ Decomposition and Recomposition, as described in
 Unicode Standard Annex #15.
 """
 
+edition = "2018"
+
 exclude = [ "target/*", "Cargo.lock", "scripts/tmp", "*.txt", "tests/*" ]
 
 [dependencies.tinyvec]
diff --git a/src/lib.rs b/src/lib.rs
@@ -43,9 +43,9 @@
 
 extern crate tinyvec;
 
-pub use tables::UNICODE_VERSION;
-pub use decompose::Decompositions;
-pub use quick_check::{
+pub use crate::tables::UNICODE_VERSION;
+pub use crate::decompose::Decompositions;
+pub use crate::quick_check::{
     IsNormalized,
     is_nfc,
     is_nfc_quick,
@@ -60,8 +60,8 @@ pub use quick_check::{
     is_nfd_stream_safe,
     is_nfd_stream_safe_quick,
 };
-pub use recompose::Recompositions;
-pub use stream_safe::StreamSafe;
+pub use crate::recompose::Recompositions;
+pub use crate::stream_safe::StreamSafe;
 use std::str::Chars;
 
 mod decompose;
@@ -80,9 +80,9 @@ pub mod __test_api;
 
 /// Methods for composing and decomposing characters.
 pub mod char {
-    pub use normalize::{decompose_canonical, decompose_compatible, compose};
+    pub use crate::normalize::{decompose_canonical, decompose_compatible, compose};
 
-    pub use lookups::{canonical_combining_class, is_combining_mark};
+    pub use crate::lookups::{canonical_combining_class, is_combining_mark};
 }
 
 
diff --git a/src/lookups.rs b/src/lookups.rs
@@ -10,8 +10,8 @@
 
 //! Lookups of unicode properties using minimal perfect hashing.
 
-use perfect_hash::mph_lookup;
-use tables::*;
+use crate::perfect_hash::mph_lookup;
+use crate::tables::*;
 
 /// Look up the canonical combining class for a codepoint.
 /// 
diff --git a/src/normalize.rs b/src/normalize.rs
@@ -11,7 +11,7 @@
 //! Functions for computing canonical and compatible decompositions for Unicode characters.
 use std::char;
 use std::ops::FnMut;
-use lookups::{canonical_fully_decomposed, composition_table, compatibility_fully_decomposed};
+use crate::lookups::{canonical_fully_decomposed, composition_table, compatibility_fully_decomposed};
 
 /// Compute canonical Unicode decomposition for character.
 /// See [Unicode Standard Annex #15](http://www.unicode.org/reports/tr15/)
@@ -74,8 +74,8 @@ const T_BASE: u32 = 0x11A7;
 const L_COUNT: u32 = 19;
 const V_COUNT: u32 = 21;
 const T_COUNT: u32 = 28;
-const N_COUNT: u32 = (V_COUNT * T_COUNT);
-const S_COUNT: u32 = (L_COUNT * N_COUNT);
+const N_COUNT: u32 = V_COUNT * T_COUNT;
+const S_COUNT: u32 = L_COUNT * N_COUNT;
 
 const S_LAST: u32 = S_BASE + S_COUNT - 1;
 const L_LAST: u32 = L_BASE + L_COUNT - 1;
diff --git a/src/quick_check.rs b/src/quick_check.rs
@@ -1,7 +1,7 @@
-use UnicodeNormalization;
-use lookups::canonical_combining_class;
-use stream_safe;
-use tables;
+use crate::UnicodeNormalization;
+use crate::lookups::canonical_combining_class;
+use crate::stream_safe;
+use crate::tables;
 
 /// The QuickCheck algorithm can quickly determine if a text is or isn't
 /// normalized without any allocations in many cases, but it has to be able to
diff --git a/src/recompose.rs b/src/recompose.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use decompose::Decompositions;
+use crate::decompose::Decompositions;
 use tinyvec::TinyVec;
 use std::fmt::{self, Write};
 
diff --git a/src/stream_safe.rs b/src/stream_safe.rs
@@ -1,12 +1,12 @@
-use normalize::{
+use crate::normalize::{
     hangul_decomposition_length,
     is_hangul_syllable,
 };
-use lookups::{
+use crate::lookups::{
     canonical_combining_class, canonical_fully_decomposed, compatibility_fully_decomposed,
     stream_safe_trailing_nonstarters,
 };
-use tables::stream_safe_leading_nonstarters;
+use crate::tables::stream_safe_leading_nonstarters;
 
 pub(crate) const MAX_NONSTARTERS: usize = 30;
 const COMBINING_GRAPHEME_JOINER: char = '\u{034F}';
@@ -111,8 +111,8 @@ mod tests {
         classify_nonstarters,
     };
     use std::char;
-    use normalize::decompose_compatible;
-    use lookups::canonical_combining_class;
+    use crate::normalize::decompose_compatible;
+    use crate::lookups::canonical_combining_class;
 
     fn stream_safe(s: &str) -> String {
         StreamSafe::new(s.chars()).collect()
diff --git a/src/tables.rs b/src/tables.rs
@@ -11,8 +11,8 @@
 // NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
 
 #![allow(missing_docs)]
-use quick_check::IsNormalized;
-use quick_check::IsNormalized::*;
+use crate::quick_check::IsNormalized;
+use crate::quick_check::IsNormalized::*;
 
 #[allow(unused)]
 pub const UNICODE_VERSION: (u64, u64, u64) = (9, 0, 0);
diff --git a/tests/tests.rs b/tests/tests.rs
@@ -7,7 +7,7 @@ use unicode_normalization::__test_api::{
 mod data {
     pub mod normalization_tests;
 }
-use data::normalization_tests::NORMALIZATION_TESTS;
+use crate::data::normalization_tests::NORMALIZATION_TESTS;
 
 #[test]
 fn test_normalization_tests_unaffected() {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use unicode_normalization::__test_api::{`
`7`	`7`	`mod data {`
`8`	`8`	`pub mod normalization_tests;`
`9`	`9`	`}`
`10`		`-use data::normalization_tests::NORMALIZATION_TESTS;`
	`10`	`+use crate::data::normalization_tests::NORMALIZATION_TESTS;`
`11`	`11`
`12`	`12`	`#[test]`
`13`	`13`	`fn test_normalization_tests_unaffected() {`