all: manual edition-idioms fixes

behnam · behnam · commit 06277f9bf247 · 2019-01-06T08:36:52.000-08:00
diff --git a/apps/cli/src/bin/unic-inspector.rs b/apps/cli/src/bin/unic-inspector.rs
@@ -14,9 +14,6 @@ extern crate clap;
 #[macro_use]
 extern crate prettytable;
 
-
-
-
 use clap::Arg;
 use prettytable::format::TableFormat;
 use prettytable::Table;
diff --git a/apps/cli/src/lib.rs b/apps/cli/src/lib.rs
@@ -11,7 +11,6 @@
 #[macro_use]
 extern crate lazy_static;
 
-
 pub mod parsers;
 pub mod writers;
 
diff --git a/apps/cli/tests/quickcheck.rs b/apps/cli/tests/quickcheck.rs
@@ -11,8 +11,6 @@
 #[macro_use]
 extern crate quickcheck;
 
-
-
 use unic_cli::parsers;
 use unic_cli::writers;
 
diff --git a/apps/cli/tests/test_unic-echo.rs b/apps/cli/tests/test_unic-echo.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 use assert_cli::Assert;
 
 // At the moment, there's no way to test stdout value for an exact string, therefore a mix of
diff --git a/gen/src/main.rs b/gen/src/main.rs
@@ -20,9 +20,6 @@ extern crate lazy_static;
 #[macro_use]
 extern crate matches;
 
-
-
-
 mod source;
 mod writer;
 
diff --git a/gen/src/writer/utils/tables/mod.rs b/gen/src/writer/utils/tables/mod.rs
@@ -19,7 +19,7 @@ pub use self::range::ToRangeCharTable;
 pub use self::set::ToRangeCharSet;
 
 #[derive(Debug)]
-struct DisplayWrapper<'a, T: 'a, F: 'a>(&'a T, &'a F)
+struct DisplayWrapper<'a, T, F>(&'a T, &'a F)
 where
     F: Fn(&T, &mut fmt::Formatter<'_>) -> fmt::Result;
 
diff --git a/unic/bidi/benches/bidi_basic_benches.rs b/unic/bidi/benches/bidi_basic_benches.rs
@@ -14,7 +14,6 @@
 
 extern crate test;
 
-
 use test::Bencher;
 
 use unic_bidi::BidiInfo;
diff --git a/unic/bidi/benches/bidi_udhr_benches.rs b/unic/bidi/benches/bidi_udhr_benches.rs
@@ -14,7 +14,6 @@
 
 extern crate test;
 
-
 use test::Bencher;
 
 use unic_bidi::BidiInfo;
diff --git a/unic/bidi/src/lib.rs b/unic/bidi/src/lib.rs
@@ -71,17 +71,13 @@
 //!
 //! [tr9]: https://www.unicode.org/reports/tr9/
 
-
-
 #[macro_use]
 extern crate matches;
 
 #[cfg(feature = "serde")]
 #[macro_use]
 extern crate serde;
 
-
-
 pub use unic_ucd_bidi::UNICODE_VERSION;
 pub use unic_ucd_bidi::{bidi_class, BidiClass, BidiClassCategory};
 
diff --git a/unic/bidi/tests/conformance_tests.rs b/unic/bidi/tests/conformance_tests.rs
@@ -11,9 +11,6 @@
 
 #![cfg(test)]
 
-
-
-
 use unic_bidi::{format_chars, level, BidiClass, BidiInfo, Level};
 
 const BASIC_TEST_DATA: &str = include_str!("../../../external/unicode/ucd/data/BidiTest.txt");
diff --git a/unic/char/basics/tests/basic_tests.rs b/unic/char/basics/tests/basic_tests.rs
@@ -16,8 +16,6 @@
     unsafe_code
 )]
 
-
-
 use unic_char_basics::unicode_notation;
 
 /// Test Unicode Notation formatting for samples from Unicode Scalar Value range.
diff --git a/unic/char/basics/tests/coverage_tests.rs b/unic/char/basics/tests/coverage_tests.rs
@@ -16,9 +16,6 @@
     unsafe_code
 )]
 
-
-
-
 use unic_char_basics::{is_noncharacter, is_private_use};
 use unic_char_range::CharRange;
 
diff --git a/unic/char/property/tests/tables_tests.rs b/unic/char/property/tests/tables_tests.rs
@@ -11,8 +11,6 @@
 #[macro_use]
 extern crate unic_char_range;
 
-
-
 use unic_char_property::tables::CharDataTable;
 
 #[test]
diff --git a/unic/char/range/benches/benchmarks.rs b/unic/char/range/benches/benchmarks.rs
@@ -12,7 +12,6 @@
 
 extern crate test;
 
-
 use std::char;
 use unic_char_range::CharRange;
 
diff --git a/unic/char/range/src/lib.rs b/unic/char/range/src/lib.rs
@@ -52,8 +52,6 @@
 //! [`TrustedLen`]: https://doc.rust-lang.org/std/iter/trait.TrustedLen.html
 //!
 
-
-
 mod pkg_info;
 pub use crate::pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
diff --git a/unic/char/range/tests/iter_tests.rs b/unic/char/range/tests/iter_tests.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 use std::{char, u32, vec};
 
 use unic_char_range::CharRange;
diff --git a/unic/emoji/char/src/lib.rs b/unic/emoji/char/src/lib.rs
@@ -25,7 +25,6 @@ extern crate unic_char_property;
 #[macro_use]
 extern crate unic_char_range;
 
-
 mod pkg_info;
 pub use crate::pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
diff --git a/unic/examples/bidi_example.rs b/unic/examples/bidi_example.rs
@@ -11,8 +11,6 @@
 
 #![forbid(unsafe_code)]
 
-
-
 use unic::bidi::BidiInfo;
 
 #[cfg_attr(rustfmt, rustfmt_skip)]
diff --git a/unic/examples/normal_example.rs b/unic/examples/normal_example.rs
@@ -11,8 +11,6 @@
 
 #![forbid(unsafe_code)]
 
-
-
 use unic::normal::StrNormalForm;
 use unic::ucd::normal::compose;
 
diff --git a/unic/examples/ucd_bidi_traits_example.rs b/unic/examples/ucd_bidi_traits_example.rs
@@ -11,8 +11,6 @@
 
 #![forbid(unsafe_code)]
 
-
-
 use unic::ucd::bidi::{BidiClass, BidiClassCategory, CharBidiClass, StrBidiClass};
 
 #[cfg_attr(rustfmt, rustfmt_skip)]
diff --git a/unic/idna/mapping/src/lib.rs b/unic/idna/mapping/src/lib.rs
@@ -23,11 +23,9 @@
 //!
 //! * <https://www.unicode.org/reports/tr46/#IDNA_Mapping_Table>
 
-
 #[macro_use]
 extern crate unic_char_range;
 
-
 mod mapping;
 
 use unic_ucd_version::UnicodeVersion;
diff --git a/unic/idna/punycode/tests/punycode_tests.rs b/unic/idna/punycode/tests/punycode_tests.rs
@@ -9,9 +9,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 use rustc_serialize::json::{self, Json};
 use unic_idna_punycode::{decode, encode_str};
 
diff --git a/unic/idna/src/lib.rs b/unic/idna/src/lib.rs
@@ -47,10 +47,6 @@
 #[macro_use]
 extern crate matches;
 
-
-
-
-
 use unic_idna_mapping as mapping;
 use unic_idna_punycode as punycode;
 
diff --git a/unic/normal/src/lib.rs b/unic/normal/src/lib.rs
@@ -36,8 +36,6 @@
 //! }
 //! ```
 
-
-
 mod decompose;
 mod recompose;
 
diff --git a/unic/normal/tests/conformance_tests.rs b/unic/normal/tests/conformance_tests.rs
@@ -11,8 +11,6 @@
 
 #![cfg(test)]
 
-
-
 use unic_normal::StrNormalForm;
 
 type TestDatum = (
diff --git a/unic/segment/src/lib.rs b/unic/segment/src/lib.rs
@@ -78,10 +78,6 @@
 //! );
 //! ```
 
-
-
-
-
 pub use unic_ucd_segment::UNICODE_VERSION;
 
 mod pkg_info;
diff --git a/unic/segment/tests/basic_example.rs b/unic/segment/tests/basic_example.rs
@@ -9,9 +9,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 use unic_segment::{GraphemeIndices, Graphemes, WordBoundIndices, WordBounds, Words};
 use unic_ucd_common::is_alphanumeric;
 
diff --git a/unic/segment/tests/grapheme_cluster_conformance_tests.rs b/unic/segment/tests/grapheme_cluster_conformance_tests.rs
@@ -9,8 +9,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 use unic_segment::Graphemes;
 
 type TestData = &'static [(
diff --git a/unic/segment/tests/quickcheck_tests.rs b/unic/segment/tests/quickcheck_tests.rs
@@ -12,8 +12,6 @@
 #[macro_use]
 extern crate quickcheck;
 
-
-
 use unic_segment::{Graphemes, WordBounds};
 
 // QuickCheck Graphemes
diff --git a/unic/segment/tests/words_conformance_tests.rs b/unic/segment/tests/words_conformance_tests.rs
@@ -9,8 +9,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 use unic_segment::{WordBoundIndices, WordBounds};
 
 type TestData = &'static [(&'static str, &'static [&'static str])];
diff --git a/unic/tests/basics_test.rs b/unic/tests/basics_test.rs
@@ -11,8 +11,6 @@
 
 #![forbid(unsafe_code)]
 
-
-
 use unic::bidi::BidiInfo;
 use unic::normal::StrNormalForm;
 use unic::segment::{GraphemeIndices, Graphemes, WordBoundIndices, WordBounds, Words};
diff --git a/unic/tests/char_range_integration_tests.rs b/unic/tests/char_range_integration_tests.rs
@@ -16,11 +16,9 @@
     unsafe_code
 )]
 
-
 #[macro_use]
 extern crate unic_char_range;
 
-
 use unic_char::basics::{is_noncharacter, is_private_use, unicode_notation};
 use unic_char::range::CharRange;
 use unic_ucd::age::Age;
diff --git a/unic/ucd/age/src/lib.rs b/unic/ucd/age/src/lib.rs
@@ -26,11 +26,9 @@
 //!
 //! * <https://www.unicode.org/reports/tr44/#Character_Age>
 
-
 #[macro_use]
 extern crate unic_char_range;
 
-
 pub use unic_ucd_version::UnicodeVersion;
 
 mod pkg_info;
diff --git a/unic/ucd/age/tests/age_tests.rs b/unic/ucd/age/tests/age_tests.rs
@@ -11,8 +11,6 @@
 #[macro_use]
 extern crate unic_char_range;
 
-
-
 use unic_ucd_age::{Age, UnicodeVersion, UNICODE_VERSION};
 
 /// Character *assignement* values always have Unicode Micro (Update) Version value of zero (`0`).
diff --git a/unic/ucd/bidi/src/lib.rs b/unic/ucd/bidi/src/lib.rs
@@ -30,8 +30,6 @@ extern crate unic_char_property;
 #[macro_use]
 extern crate unic_char_range;
 
-
-
 mod pkg_info;
 pub use crate::pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
diff --git a/unic/ucd/bidi/tests/basic_tests.rs b/unic/ucd/bidi/tests/basic_tests.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 #[test]
 fn test_bidi_class_display() {
     use unic_ucd_bidi::bidi_class::abbr_names::*;
diff --git a/unic/ucd/block/src/lib.rs b/unic/ucd/block/src/lib.rs
@@ -27,8 +27,6 @@
 #[macro_use]
 extern crate unic_char_range;
 
-
-
 mod block;
 pub use crate::block::{Block, BlockIter};
 
diff --git a/unic/ucd/block/tests/basic_tests.rs b/unic/ucd/block/tests/basic_tests.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 use unic_ucd_block::{Block, BlockIter};
 
 #[test]
diff --git a/unic/ucd/case/src/lib.rs b/unic/ucd/case/src/lib.rs
@@ -30,8 +30,6 @@ extern crate unic_char_property;
 #[macro_use]
 extern crate unic_char_range;
 
-
-
 mod pkg_info;
 pub use crate::pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
diff --git a/unic/ucd/category/src/lib.rs b/unic/ucd/category/src/lib.rs
@@ -51,7 +51,6 @@ extern crate unic_char_property;
 #[macro_use]
 extern crate unic_char_range;
 
-
 mod pkg_info;
 pub use crate::pkg_info::{PKG_DESCRIPTION, PKG_NAME, PKG_VERSION};
 
diff --git a/unic/ucd/category/tests/basic_tests.rs b/unic/ucd/category/tests/basic_tests.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 use unic_ucd_category::GeneralCategory as GC;
 
 #[test]
diff --git a/unic/ucd/category/tests/major_category_tests.rs b/unic/ucd/category/tests/major_category_tests.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
 use unic_char_property::EnumeratedCharProperty;
 use unic_ucd_category::GeneralCategory;
 
diff --git a/unic/ucd/common/src/lib.rs b/unic/ucd/common/src/lib.rs
diff --git a/unic/ucd/common/tests/consistency_tests.rs b/unic/ucd/common/tests/consistency_tests.rs
diff --git a/unic/ucd/examples/lowercase_chars_with_identity_touppercase.rs b/unic/ucd/examples/lowercase_chars_with_identity_touppercase.rs
diff --git a/unic/ucd/examples/uppercase_chars_with_identity_tolowercase.rs b/unic/ucd/examples/uppercase_chars_with_identity_tolowercase.rs
diff --git a/unic/ucd/hangul/src/lib.rs b/unic/ucd/hangul/src/lib.rs
diff --git a/unic/ucd/hangul/tests/basic_tests.rs b/unic/ucd/hangul/tests/basic_tests.rs
diff --git a/unic/ucd/ident/src/lib.rs b/unic/ucd/ident/src/lib.rs
diff --git a/unic/ucd/ident/tests/lexical_class_tests.rs b/unic/ucd/ident/tests/lexical_class_tests.rs
diff --git a/unic/ucd/name/src/lib.rs b/unic/ucd/name/src/lib.rs
diff --git a/unic/ucd/name/tests/basic_tests.rs b/unic/ucd/name/tests/basic_tests.rs
diff --git a/unic/ucd/normal/src/lib.rs b/unic/ucd/normal/src/lib.rs
diff --git a/unic/ucd/normal/tests/conformance_tests.rs b/unic/ucd/normal/tests/conformance_tests.rs
diff --git a/unic/ucd/normal/tests/excluded_composition_tests.rs b/unic/ucd/normal/tests/excluded_composition_tests.rs
diff --git a/unic/ucd/segment/src/lib.rs b/unic/ucd/segment/src/lib.rs
diff --git a/unic/ucd/segment/tests/basic_tests.rs b/unic/ucd/segment/tests/basic_tests.rs
diff --git a/unic/ucd/segment/tests/conformance_tests.rs b/unic/ucd/segment/tests/conformance_tests.rs
diff --git a/unic/ucd/tests/bidi_class_consistency_tests.rs b/unic/ucd/tests/bidi_class_consistency_tests.rs
diff --git a/unic/ucd/version/src/lib.rs b/unic/ucd/version/src/lib.rs
diff --git a/unic/ucd/version/tests/basic_tests.rs b/unic/ucd/version/tests/basic_tests.rs
