8000 Merge pull request #66 from sunfishcode/master · unicode-rs/unicode-normalization@9c63f55 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9c63f55

Browse files
ManishearthManishearth
authored
Merge pull request #66 from sunfishcode/master
Minor cleanups after #63
2 parents 5967481 + 0ca6e73 commit 9c63f55

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

‎fuzz/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ publish = false
88
cargo-fuzz = true
99

1010
[dependencies]
11-
libfuzzer-sys = "0.3.2"
12-
unicode-normalization = "0.1.15"
11+
libfuzzer-sys = "0.3.4"
12+
unicode-normalization = { path = ".." }
1313

1414
[[bin]]
1515
name = "unicode-normalization"

‎fuzz/fuzz_targets/unicode-normalization.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@ fn from_bool(is_normalized: bool) -> IsNormalized {
1919

2020
fuzz_target!(|input: String| {
2121
// The full predicates imply the quick predicates.
22-
assert!(is_nfc_quick(input.chars()) != from_bool(!is_nfc(&input)));
23-
assert!(is_nfd_quick(input.chars()) != from_bool(!is_nfd(&input)));
24-
assert!(is_nfkc_quick(input.chars()) != from_bool(!is_nfkc(&input)));
25-
assert!(is_nfkd_quick(input.chars()) != from_bool(!is_nfkd(&input)));
26-
assert!(is_nfc_stream_safe_quick(input.chars()) != from_bool(!is_nfc_stream_safe(&input)));
27-
assert!(is_nfd_stream_safe_quick(input.chars()) != from_bool(!is_nfd_stream_safe(&input)));
22+
assert_ne!(is_nfc_quick(input.chars()), from_bool(!is_nfc(&input)));
23+
assert_ne!(is_nfd_quick(input.chars()), from_bool(!is_nfd(&input)));
24+
assert_ne!(is_nfkc_quick(input.chars()), from_bool(!is_nfkc(&input)));
25+
assert_ne!(is_nfkd_quick(input.chars()), from_bool(!is_nfkd(&input)));
26+
assert_ne!(
27+
is_nfc_stream_safe_quick(input.chars()),
28+
from_bool(!is_nfc_stream_safe(&input))
29+
);
30+
assert_ne!(
31+
is_nfd_stream_safe_quick(input.chars()),
32+
from_bool(!is_nfd_stream_safe(&input))
33+
);
2834

2935
// Check NFC, NFD, NFKC, and NFKD normalization.
3036
let nfc = input.chars().nfc().collect::<String>();

‎tests/test_streamsafe_regression.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use unicode_normalization::{
2-
char::canonical_combining_class, is_nfc, is_nfc_stream_safe, UnicodeNormalization,
2+
is_nfc, is_nfc_stream_safe, UnicodeNormalization,
33
};
44

55
#[test]

0 commit comments

Comments
 (0)
0