Skip to content

Commit 5ae736c

Browse files
committed
clippy
1 parent a475479 commit 5ae736c

22 files changed

+169
-176
lines changed

src/is_hiragana.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ pub fn is_hiragana(input: &str) -> bool {
1010

1111
#[test]
1212
fn check_is_hiragana() {
13-
assert_eq!(is_hiragana("げーむ"), true);
14-
assert_eq!(is_hiragana("A"), false);
15-
assert_eq!(is_hiragana("あア"), false);
13+
assert!(is_hiragana("げーむ"));
14+
assert!(!is_hiragana("A"));
15+
assert!(!is_hiragana("あア"));
1616
}
1717

1818
#[cfg(test)]
@@ -21,30 +21,30 @@ mod tests {
2121

2222
#[test]
2323
fn sane_defaults() {
24-
assert_eq!(is_hiragana(""), false);
24+
assert!(!is_hiragana(""));
2525
}
2626
#[test]
2727
fn あ_is_hiragana() {
28-
assert_eq!(is_hiragana("あ"), true);
28+
assert!(is_hiragana("あ"));
2929
}
3030
#[test]
3131
fn ああ_is_hiragana() {
32-
assert_eq!(is_hiragana("ああ"), true);
32+
assert!(is_hiragana("ああ"));
3333
}
3434
#[test]
3535
fn ア_is_not_hiragana() {
36-
assert_eq!(is_hiragana("ア"), false);
36+
assert!(!is_hiragana("ア"));
3737
}
3838
#[test]
3939
fn a_is_not_hiragana() {
40-
assert_eq!(is_hiragana("A"), false);
40+
assert!(!is_hiragana("A"));
4141
}
4242
#[test]
4343
fn あア_is_not_hiragana() {
44-
assert_eq!(is_hiragana("あア"), false);
44+
assert!(!is_hiragana("あア"));
4545
}
4646
#[test]
4747
fn ignores_long_dash_in_hiragana() {
48-
assert_eq!(is_hiragana("げーむ"), true);
48+
assert!(is_hiragana("げーむ"));
4949
}
5050
}

src/is_kana.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ mod tests {
1414

1515
#[test]
1616
fn sane_defaults() {
17-
assert_eq!(is_kana(""), false);
17+
assert!(!is_kana(""));
1818
}
1919
#[test]
2020
fn あ_is_kana() {
21-
assert_eq!(is_kana("あ"), true);
21+
assert!(is_kana("あ"));
2222
}
2323
#[test]
2424
fn ア_is_kana() {
25-
assert_eq!(is_kana("ア"), true);
25+
assert!(is_kana("ア"));
2626
}
2727
#[test]
2828
fn あア_is_kana() {
29-
assert_eq!(is_kana("あア"), true);
29+
assert!(is_kana("あア"));
3030
}
3131
#[test]
3232
fn a_is_not_kana() {
33-
assert_eq!(is_kana("A"), false);
33+
assert!(!is_kana("A"));
3434
}
3535
#[test]
3636
fn あaア_is_not_kana() {
37-
assert_eq!(is_kana("あAア"), false);
37+
assert!(!is_kana("あAア"));
3838
}
3939
#[test]
4040
fn ignores_long_dash_in_mixed_kana() {
41-
assert_eq!(is_kana("アーあ"), true);
41+
assert!(is_kana("アーあ"));
4242
}
4343
}

src/is_kanji.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,60 +24,60 @@ mod tests {
2424

2525
#[test]
2626
fn sane_defaults() {
27-
assert_eq!(is_kanji(""), false);
28-
assert_eq!(contains_kanji(""), false);
27+
assert!(!is_kanji(""));
28+
assert!(!contains_kanji(""));
2929
}
3030

3131
#[test]
3232
fn 勢い_contains_kanji() {
33-
assert_eq!(contains_kanji("勢い"), true);
33+
assert!(contains_kanji("勢い"));
3434
}
3535
#[test]
3636
fn hello_contains_not_kanji() {
37-
assert_eq!(contains_kanji("hello"), false);
37+
assert!(!contains_kanji("hello"));
3838
}
3939
#[test]
4040
fn 切腹_is_kanji() {
41-
assert_eq!(is_kanji("切腹"), true);
41+
assert!(is_kanji("切腹"));
4242
}
4343
#[test]
4444
fn 刀_is_kanji() {
45-
assert_eq!(is_kanji("刀"), true);
45+
assert!(is_kanji("刀"));
4646
}
4747
#[test]
4848
fn emoji_are_not_kanji() {
49-
assert_eq!(is_kanji("🐸"), false);
49+
assert!(!is_kanji("🐸"));
5050
}
5151
#[test]
5252
fn あ_is_not_kanji() {
53-
assert_eq!(is_kanji("あ"), false);
53+
assert!(!is_kanji("あ"));
5454
}
5555
#[test]
5656
fn ア_is_not_kanji() {
57-
assert_eq!(is_kanji("ア"), false);
57+
assert!(!is_kanji("ア"));
5858
}
5959
#[test]
6060
fn あア_is_not_kanji() {
61-
assert_eq!(is_kanji("あア"), false);
61+
assert!(!is_kanji("あア"));
6262
}
6363
#[test]
6464
fn a_is_not_kanji() {
65-
assert_eq!(is_kanji("A"), false);
65+
assert!(!is_kanji("A"));
6666
}
6767
#[test]
6868
fn あaア_is_not_kanji() {
69-
assert_eq!(is_kanji("あAア"), false);
69+
assert!(!is_kanji("あAア"));
7070
}
7171
#[test]
7272
fn number_with_kanj_is_not_kanji1() {
73-
assert_eq!(is_kanji("12隻"), false);
73+
assert!(!is_kanji("12隻"));
7474
}
7575
#[test]
7676
fn number_with_kanj_is_not_kanji2() {
77-
assert_eq!(is_kanji("12隻"), false);
77+
assert!(!is_kanji("12隻"));
7878
}
7979
#[test]
8080
fn kanji_with_dot_is_not_kanji() {
81-
assert_eq!(is_kanji("隻。"), false);
81+
assert!(!is_kanji("隻。"));
8282
}
8383
}

src/is_katakana.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ mod tests {
1414

1515
#[test]
1616
fn sane_defaults() {
17-
assert_eq!(is_katakana(""), false);
17+
assert!(!is_katakana(""));
1818
}
1919
#[test]
2020
fn アア_is_katakana() {
21-
assert_eq!(is_katakana("アア"), true);
21+
assert!(is_katakana("アア"));
2222
}
2323
#[test]
2424
fn ア_is_katakana() {
25-
assert_eq!(is_katakana("ア"), true);
25+
assert!(is_katakana("ア"));
2626
}
2727
#[test]
2828
fn あ_is_not_katakana() {
29-
assert_eq!(is_katakana("あ"), false);
29+
assert!(!is_katakana("あ"));
3030
}
3131
#[test]
3232
fn a_is_not_katakana() {
33-
assert_eq!(is_katakana("A"), false);
33+
assert!(!is_katakana("A"));
3434
}
3535
#[test]
3636
fn あア_is_not_katakana() {
37-
assert_eq!(is_katakana("あア"), false);
37+
assert!(!is_katakana("あア"));
3838
}
3939
#[test]
4040
fn ignores_long_dash_in_katakana() {
41-
assert_eq!(is_katakana("ゲーム"), true);
41+
assert!(is_katakana("ゲーム"));
4242
}
4343
}

src/is_mixed.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,50 @@ mod tests {
2828

2929
#[test]
3030
fn sane_defaults() {
31-
assert_eq!(is_mixed(""), false);
31+
assert!(!is_mixed(""));
3232
}
3333
#[test]
3434
fn aア_is_mixed() {
35-
assert_eq!(is_mixed("Aア"), true);
35+
assert!(is_mixed("Aア"));
3636
}
3737
#[test]
3838
fn aあ_is_mixed() {
39-
assert_eq!(is_mixed("Aあ"), true);
39+
assert!(is_mixed("Aあ"));
4040
}
4141
#[test]
4242
fn aあア_is_mixed() {
43-
assert_eq!(is_mixed("Aあア"), true);
43+
assert!(is_mixed("Aあア"));
4444
}
4545
#[test]
4646
fn number_2あア_is_not_mixed() {
47-
assert_eq!(is_mixed("2あア"), false);
47+
assert!(!is_mixed("2あア"));
4848
}
4949
#[test]
5050
fn お腹a_is_mixed() {
51-
assert_eq!(is_mixed("お腹A"), true);
51+
assert!(is_mixed("お腹A"));
5252
}
5353
#[test]
5454
fn お腹a_is_not_mixed_when_pass_kanji_false() {
55-
assert_eq!(is_mixed_pass_kanji("お腹A", false), false);
55+
assert!(!is_mixed_pass_kanji("お腹A", false));
5656
}
5757
#[test]
5858
fn お腹_is_not_mixed() {
59-
assert_eq!(is_mixed("お腹"), false);
59+
assert!(!is_mixed("お腹"));
6060
}
6161
#[test]
6262
fn 腹_is_not_mixed() {
63-
assert_eq!(is_mixed("腹"), false);
63+
assert!(!is_mixed("腹"));
6464
}
6565
#[test]
6666
fn a_is_not_mixed() {
67-
assert_eq!(is_mixed("A"), false);
67+
assert!(!is_mixed("A"));
6868
}
6969
#[test]
7070
fn あ_is_not_mixed() {
71-
assert_eq!(is_mixed("あ"), false);
71+
assert!(!is_mixed("あ"));
7272
}
7373
#[test]
7474
fn ア_is_not_mixed() {
75-
assert_eq!(is_mixed("ア"), false);
75+
assert!(!is_mixed("ア"));
7676
}
7777
}

src/is_romaji.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ pub fn is_romaji_with_whitelist(input: &str, allowed: Option<&Regex>) -> bool {
3131

3232
#[test]
3333
fn check_is_romaji() {
34-
assert_eq!(is_romaji("Tōkyō and Ōsaka"), true);
35-
assert_eq!(is_romaji("12a*b&c-d"), true);
36-
assert_eq!(is_romaji("あアA"), false);
37-
assert_eq!(is_romaji("お願い"), false);
38-
assert_eq!(is_romaji("a!b&cーd"), false);
34+
assert!(is_romaji("Tōkyō and Ōsaka"));
35+
assert!(is_romaji("12a*b&c-d"));
36+
assert!(!is_romaji("あアA"));
37+
assert!(!is_romaji("お願い"));
38+
assert!(!is_romaji("a!b&cーd"));
3939
}
4040

4141
#[cfg(test)]
@@ -44,50 +44,50 @@ mod tests {
4444

4545
#[test]
4646
fn sane_defaults() {
47-
assert_eq!(is_romaji(""), false);
47+
assert!(!is_romaji(""));
4848

4949
#[cfg(feature = "enable_regex")]
5050
assert_eq!(is_romaji_with_whitelist("", None), false);
5151
}
5252
#[test]
5353
fn a_is_romaji() {
54-
assert_eq!(is_romaji("A"), true);
54+
assert!(is_romaji("A"));
5555
}
5656
#[test]
5757
fn x_yz_is_romaji() {
58-
assert_eq!(is_romaji("xYz"), true);
58+
assert!(is_romaji("xYz"));
5959
}
6060
#[test]
6161
fn tōkyō_and_ōsaka_is_romaji() {
62-
assert_eq!(is_romaji("Tōkyō and Ōsaka"), true);
62+
assert!(is_romaji("Tōkyō and Ōsaka"));
6363
}
6464
#[test]
6565
fn あアa_is_not_romaji() {
66-
assert_eq!(is_romaji("あアA"), false);
66+
assert!(!is_romaji("あアA"));
6767
}
6868
#[test]
6969
fn お願い_is_not_romaji() {
70-
assert_eq!(is_romaji("お願い"), false);
70+
assert!(!is_romaji("お願い"));
7171
}
7272
#[test]
7373
fn 熟成_is_not_romaji() {
74-
assert_eq!(is_romaji("熟成"), false);
74+
assert!(!is_romaji("熟成"));
7575
}
7676
#[test]
7777
fn passes_latin_punctuation() {
78-
assert_eq!(is_romaji("a*b&c-d"), true);
78+
assert!(is_romaji("a*b&c-d"));
7979
}
8080
#[test]
8181
fn passes_latin_numbers() {
82-
assert_eq!(is_romaji("0123456789"), true);
82+
assert!(is_romaji("0123456789"));
8383
}
8484
#[test]
8585
fn fails_zenkaku_punctuation() {
86-
assert_eq!(is_romaji("a!b&cーd"), false);
86+
assert!(!is_romaji("a!b&cーd"));
8787
}
8888
#[test]
8989
fn fails_zenkaku_latin() {
90-
assert_eq!(is_romaji("hello"), false);
90+
assert!(!is_romaji("hello"));
9191
}
9292

9393
#[cfg(feature = "enable_regex")]

src/to_kana_node_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub(crate) struct Node {
55
}
66

77
impl Node {
8-
pub(crate) fn get<'a>(&self, chars: &'a [char]) -> (Option<&'static str>, usize) {
8+
pub(crate) fn get(&self, chars: &[char]) -> (Option<&'static str>, usize) {
99
let mut i = 0;
1010
let mut curr_node = self;
1111
for char in chars.iter() {

src/to_romaji_node_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub(crate) struct Node {
55
}
66

77
impl Node {
8-
pub(crate) fn get<'a>(&self, chars: &'a [char]) -> (&'static str, usize) {
8+
pub(crate) fn get(&self, chars: &[char]) -> (&'static str, usize) {
99
let mut i = 0;
1010
let mut curr_node = self;
1111
for char in chars.iter() {

src/utils/is_char_consonant.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pub fn is_char_consonant(char: char, include_y: bool) -> bool {
1414

1515
#[test]
1616
fn is_char_consonant_test() {
17-
assert_eq!(is_char_consonant('y', false), false);
18-
assert_eq!(is_char_consonant('y', true), true);
19-
assert_eq!(is_char_consonant('a', true), false);
20-
assert_eq!(is_char_consonant('!', true), false);
17+
assert!(!is_char_consonant('y', false));
18+
assert!(is_char_consonant('y', true));
19+
assert!(!is_char_consonant('a', true));
20+
assert!(!is_char_consonant('!', true));
2121
}

src/utils/is_char_hiragana.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub fn is_char_hiragana(char: char) -> bool {
1212

1313
#[test]
1414
fn is_char_hiragana_test() {
15-
assert_eq!(is_char_hiragana('な'), true);
16-
assert_eq!(is_char_hiragana('ナ'), false);
17-
assert_eq!(is_char_hiragana('n'), false);
18-
assert_eq!(is_char_hiragana('!'), false);
15+
assert!(is_char_hiragana('な'));
16+
assert!(!is_char_hiragana('ナ'));
17+
assert!(!is_char_hiragana('n'));
18+
assert!(!is_char_hiragana('!'));
1919
}

src/utils/is_char_in_range.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ pub fn is_char_in_range(char: char, start: u32, end: u32) -> bool {
1414
#[test]
1515
fn is_char_in_range_test() {
1616
use crate::constants::{HIRAGANA_END, HIRAGANA_START};
17-
assert_eq!(is_char_in_range('は', HIRAGANA_START, HIRAGANA_END), true);
18-
assert_eq!(is_char_in_range('d', HIRAGANA_START, HIRAGANA_END), false);
17+
assert!(is_char_in_range('は', HIRAGANA_START, HIRAGANA_END));
18+
assert!(!is_char_in_range('d', HIRAGANA_START, HIRAGANA_END));
1919
}

0 commit comments

Comments
 (0)