Drop redundant use-declarations

dvdhrm · dvdhrm · commit 8803440e61ac · 2024-04-11T16:26:03.000+02:00
The package is always compiled as `no_std` and pulls in `std`  and
`test` when compiling tests. Hence:

- The prelude of `core` is available unconditionally, and it includes
  `core::options::Option` and its variants. No need to manually declare
  them.

- The `test` crate is in-scope automatically, so no need to manually
  declare it.
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -422,8 +422,6 @@ def emit_module(
         module.write(
             """
 pub mod charwidth {
-    use core::option::Option::{self, None, Some};
-
     /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
     /// consulting a multi-level lookup table.
     /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
diff --git a/src/tables.rs b/src/tables.rs
@@ -15,8 +15,6 @@
 pub const UNICODE_VERSION: (u8, u8, u8) = (15, 1, 0);
 
 pub mod charwidth {
-    use core::option::Option::{self, None, Some};
-
     /// Returns the [UAX #11](https://www.unicode.org/reports/tr11/) based width of `c` by
     /// consulting a multi-level lookup table.
     /// If `is_cjk == true`, ambiguous width characters are treated as double width; otherwise,
diff --git a/src/tests.rs b/src/tests.rs
@@ -13,7 +13,7 @@ use super::{UnicodeWidthChar, UnicodeWidthStr};
 #[cfg(feature = "bench")]
 use std::iter;
 #[cfg(feature = "bench")]
-use test::{self, Bencher};
+use test::Bencher;
 
 use std::prelude::v1::*;
 
@@ -140,8 +140,6 @@ fn test_emoji() {
 #[test]
 fn test_char() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('ｈ'), Some(2));
     assert_eq!('ｈ'.width_cjk(), Some(2));
@@ -156,8 +154,6 @@ fn test_char() {
 #[test]
 fn test_char2() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\x00'), Some(0));
     assert_eq!('\x00'.width_cjk(), Some(0));
@@ -187,17 +183,13 @@ fn test_char2() {
 #[test]
 fn unicode_12() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{1F971}'), Some(2));
 }
 
 #[test]
 fn test_default_ignorable() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{E0000}'), Some(0));
 
@@ -209,8 +201,6 @@ fn test_default_ignorable() {
 #[test]
 fn test_jamo() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{1100}'), Some(2));
     assert_eq!(UnicodeWidthChar::width('\u{A97C}'), Some(2));
@@ -225,8 +215,6 @@ fn test_jamo() {
 #[test]
 fn test_prepended_concatenation_marks() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{0600}'), Some(1));
     assert_eq!(UnicodeWidthChar::width('\u{070F}'), Some(1));
@@ -237,8 +225,6 @@ fn test_prepended_concatenation_marks() {
 #[test]
 fn test_interlinear_annotation_chars() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{FFF9}'), Some(1));
     assert_eq!(UnicodeWidthChar::width('\u{FFFA}'), Some(1));
@@ -248,8 +234,6 @@ fn test_interlinear_annotation_chars() {
 #[test]
 fn test_hieroglyph_format_controls() {
     use super::UnicodeWidthChar;
-    #[cfg(feature = "no_std")]
-    use core::option::Option::{None, Some};
 
     assert_eq!(UnicodeWidthChar::width('\u{13430}'), Some(1));
     assert_eq!(UnicodeWidthChar::width('\u{13436}'), Some(1));
