Skip to content

Commit bf7e494

Browse files
authored
Merge pull request #3 from linkmauve/fix-warnings
Fix a few warnings
2 parents 59425e8 + 0671f3b commit bf7e494

File tree

5 files changed

+40
-46
lines changed

5 files changed

+40
-46
lines changed

circle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
working_directory: ~/build
55
docker:
6-
- image: jimmycuadra/rust:1.18.0
6+
- image: rust:1.47.0
77
steps:
88
- checkout
99
- restore_cache:
@@ -14,10 +14,10 @@ jobs:
1414
paths:
1515
- ~/.cargo/registry/index
1616
- restore_cache:
17-
key: dependencies-1.18-{{ checksum "Cargo.lock" }}
17+
key: dependencies-1.47-{{ checksum "Cargo.lock" }}
1818
- run: cargo test
1919
- save_cache:
20-
key: dependencies-1.18-{{ checksum "Cargo.lock" }}
20+
key: dependencies-1.47-{{ checksum "Cargo.lock" }}
2121
paths:
2222
- target
2323
- ~/.cargo/registry/cache

src/lib.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
extern crate unicode_bidi;
77
extern crate unicode_normalization;
88

9-
use std::ascii::AsciiExt;
109
use std::borrow::Cow;
11-
use std::error;
1210
use std::fmt;
1311
use unicode_normalization::UnicodeNormalization;
1412

@@ -37,18 +35,14 @@ impl fmt::Display for Error {
3735
}
3836
}
3937

40-
impl error::Error for Error {
41-
fn description(&self) -> &str {
42-
"error performing stringprep algorithm"
43-
}
44-
}
38+
impl std::error::Error for Error {}
4539

4640
/// Prepares a string with the SASLprep profile of the stringprep algorithm.
4741
///
4842
/// SASLprep is defined in [RFC 4013][].
4943
///
5044
/// [RFC 4013]: https://tools.ietf.org/html/rfc4013
51-
pub fn saslprep<'a>(s: &'a str) -> Result<Cow<'a, str>, Error> {
45+
pub fn saslprep(s: &str) -> Result<Cow<'_, str>, Error> {
5246
// fast path for ascii text
5347
if s.chars()
5448
.all(|c| c.is_ascii() && !tables::ascii_control_character(c)) {
@@ -128,7 +122,7 @@ fn is_prohibited_bidirectional_text(s: &str) -> bool {
128122
/// Nameprep is defined in [RFC 3491][].
129123
///
130124
/// [RFC 3491]: https://tools.ietf.org/html/rfc3491
131-
pub fn nameprep<'a>(s: &'a str) -> Result<Cow<'a, str>, Error> {
125+
pub fn nameprep(s: &str) -> Result<Cow<'_, str>, Error> {
132126
// 3. Mapping
133127
let mapped = s.chars()
134128
.filter(|&c| !tables::commonly_mapped_to_nothing(c))
@@ -176,7 +170,7 @@ pub fn nameprep<'a>(s: &'a str) -> Result<Cow<'a, str>, Error> {
176170
/// Nameprep is defined in [RFC 3920, Appendix A][].
177171
///
178172
/// [RFC 3920, Appendix A]: https://tools.ietf.org/html/rfc3920#appendix-A
179-
pub fn nodeprep<'a>(s: &'a str) -> Result<Cow<'a, str>, Error> {
173+
pub fn nodeprep(s: &str) -> Result<Cow<'_, str>, Error> {
180174
// A.3. Mapping
181175
let mapped = s.chars()
182176
.filter(|&c| !tables::commonly_mapped_to_nothing(c))
@@ -234,7 +228,7 @@ fn prohibited_node_character(c: char) -> bool {
234228
/// Nameprep is defined in [RFC 3920, Appendix B][].
235229
///
236230
/// [RFC 3920, Appendix B]: https://tools.ietf.org/html/rfc3920#appendix-B
237-
pub fn resourceprep<'a>(s: &'a str) -> Result<Cow<'a, str>, Error> {
231+
pub fn resourceprep(s: &str) -> Result<Cow<'_, str>, Error> {
238232
// B.3. Mapping
239233
let mapped = s.chars()
240234
.filter(|&c| !tables::commonly_mapped_to_nothing(c))

src/rfc3454.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// AUTOGENERATED CODE - DO NOT EDIT
22

3-
pub const A_1: &'static [(char, char)] = &[
3+
pub const A_1: &[(char, char)] = &[
44
('\u{0221}', '\u{0221}'),
55
('\u{0234}', '\u{024F}'),
66
('\u{02AE}', '\u{02AF}'),
@@ -399,7 +399,7 @@ pub const A_1: &'static [(char, char)] = &[
399399
('\u{E0080}', '\u{EFFFD}'),
400400
];
401401

402-
pub const B_2: &'static [(char, &'static str)] = &[
402+
pub const B_2: &[(char, &str)] = &[
403403
('\u{0041}', "\u{0061}"),
404404
('\u{0042}', "\u{0062}"),
405405
('\u{0043}', "\u{0063}"),

src/tables.rs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub fn non_ascii_space_character(c: char) -> bool {
7676
/// C.2.1 ASCII control characters
7777
pub fn ascii_control_character(c: char) -> bool {
7878
match c {
79-
'\u{0000}'...'\u{001F}' |
79+
'\u{0000}'..='\u{001F}' |
8080
'\u{007F}' => true,
8181
_ => false,
8282
}
@@ -85,7 +85,7 @@ pub fn ascii_control_character(c: char) -> bool {
8585
/// C.2.2 Non-ASCII control characters
8686
pub fn non_ascii_control_character(c: char) -> bool {
8787
match c {
88-
'\u{0080}'...'\u{009F}' |
88+
'\u{0080}'..='\u{009F}' |
8989
'\u{06DD}' |
9090
'\u{070F}' |
9191
'\u{180E}' |
@@ -97,45 +97,45 @@ pub fn non_ascii_control_character(c: char) -> bool {
9797
'\u{2061}' |
9898
'\u{2062}' |
9999
'\u{2063}' |
100-
'\u{206A}'...'\u{206F}' |
100+
'\u{206A}'..='\u{206F}' |
101101
'\u{FEFF}' |
102-
'\u{FFF9}'...'\u{FFFC}' |
103-
'\u{1D173}'...'\u{1D17A}' => true,
102+
'\u{FFF9}'..='\u{FFFC}' |
103+
'\u{1D173}'..='\u{1D17A}' => true,
104104
_ => false,
105105
}
106106
}
107107

108108
/// C.3 Private use
109109
pub fn private_use(c: char) -> bool {
110110
match c {
111-
'\u{E000}'...'\u{F8FF}' |
112-
'\u{F0000}'...'\u{FFFFD}' |
113-
'\u{100000}'...'\u{10FFFD}' => true,
111+
'\u{E000}'..='\u{F8FF}' |
112+
'\u{F0000}'..='\u{FFFFD}' |
113+
'\u{100000}'..='\u{10FFFD}' => true,
114114
_ => false,
115115
}
116116
}
117117

118118
/// C.4 Non-character code points
119119
pub fn non_character_code_point(c: char) -> bool {
120120
match c {
121-
'\u{FDD0}'...'\u{FDEF}' |
122-
'\u{FFFE}'...'\u{FFFF}' |
123-
'\u{1FFFE}'...'\u{1FFFF}' |
124-
'\u{2FFFE}'...'\u{2FFFF}' |
125-
'\u{3FFFE}'...'\u{3FFFF}' |
126-
'\u{4FFFE}'...'\u{4FFFF}' |
127-
'\u{5FFFE}'...'\u{5FFFF}' |
128-
'\u{6FFFE}'...'\u{6FFFF}' |
129-
'\u{7FFFE}'...'\u{7FFFF}' |
130-
'\u{8FFFE}'...'\u{8FFFF}' |
131-
'\u{9FFFE}'...'\u{9FFFF}' |
132-
'\u{AFFFE}'...'\u{AFFFF}' |
133-
'\u{BFFFE}'...'\u{BFFFF}' |
134-
'\u{CFFFE}'...'\u{CFFFF}' |
135-
'\u{DFFFE}'...'\u{DFFFF}' |
136-
'\u{EFFFE}'...'\u{EFFFF}' |
137-
'\u{FFFFE}'...'\u{FFFFF}' |
138-
'\u{10FFFE}'...'\u{10FFFF}' => true,
121+
'\u{FDD0}'..='\u{FDEF}' |
122+
'\u{FFFE}'..='\u{FFFF}' |
123+
'\u{1FFFE}'..='\u{1FFFF}' |
124+
'\u{2FFFE}'..='\u{2FFFF}' |
125+
'\u{3FFFE}'..='\u{3FFFF}' |
126+
'\u{4FFFE}'..='\u{4FFFF}' |
127+
'\u{5FFFE}'..='\u{5FFFF}' |
128+
'\u{6FFFE}'..='\u{6FFFF}' |
129+
'\u{7FFFE}'..='\u{7FFFF}' |
130+
'\u{8FFFE}'..='\u{8FFFF}' |
131+
'\u{9FFFE}'..='\u{9FFFF}' |
132+
'\u{AFFFE}'..='\u{AFFFF}' |
133+
'\u{BFFFE}'..='\u{BFFFF}' |
134+
'\u{CFFFE}'..='\u{CFFFF}' |
135+
'\u{DFFFE}'..='\u{DFFFF}' |
136+
'\u{EFFFE}'..='\u{EFFFF}' |
137+
'\u{FFFFE}'..='\u{FFFFF}' |
138+
'\u{10FFFE}'..='\u{10FFFF}' => true,
139139
_ => false,
140140
}
141141
}
@@ -144,7 +144,7 @@ pub fn non_character_code_point(c: char) -> bool {
144144
pub fn surrogate_code(c: char) -> bool {
145145
match c {
146146
// forbidden by rust
147-
/*'\u{D800}'...'\u{DFFF}' => true,*/
147+
/*'\u{D800}'..='\u{DFFF}' => true,*/
148148
_ => false,
149149
}
150150
}
@@ -160,7 +160,7 @@ pub fn inappropriate_for_plain_text(c: char) -> bool {
160160
/// C.7 Inappropriate for canonical representation
161161
pub fn inappropriate_for_canonical_representation(c: char) -> bool {
162162
match c {
163-
'\u{2FF0}'...'\u{2FFB}' => true,
163+
'\u{2FF0}'..='\u{2FFB}' => true,
164164
_ => false,
165165
}
166166
}
@@ -179,7 +179,7 @@ pub fn change_display_properties_or_deprecated(c: char) -> bool {
179179
pub fn tagging_character(c: char) -> bool {
180180
match c {
181181
'\u{E0001}' |
182-
'\u{E0020}'...'\u{E007F}' => true,
182+
'\u{E0020}'..='\u{E007F}' => true,
183183
_ => false,
184184
}
185185
}

tests/nameprep_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn should_case_fold_and_normalize() {
9595
fn should_revert_case_fold_and_normalization() {
9696
let inputs = ["\u{01f0}", "\u{0390}", "\u{03b0}", "\u{1e96}", "\u{1f56}"];
9797
for input in inputs.iter() {
98-
assert_eq!(input.clone(), nameprep(input).unwrap());
98+
assert_eq!(*input, nameprep(input).unwrap());
9999
}
100100
}
101101

0 commit comments

Comments
 (0)