Skip to content

Commit 15d8b3b

Browse files
epageepage
committed
style: Make clippy happy
1 parent 2f0d916 commit 15d8b3b

File tree

6 files changed

+48
-44
lines changed

6 files changed

+48
-44
lines changed

‎clap_lex/src/lib.rs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
//! verbosity: 0,
5353
//! };
5454
//!
55-
//! let raw = clap_lex::RawArgs::from_iter(raw);
55+
//! let raw = clap_lex::RawArgs::new(raw);
5656
//! let mut cursor = raw.cursor();
5757
//! raw.next(&mut cursor); // Skip the bin
5858
//! while let Some(arg) = raw.next(&mut cursor) {
@@ -124,6 +124,8 @@ pub struct RawArgs {
124124
impl RawArgs {
125125
//// Create an argument list to parse
126126
///
127+
/// **NOTE:** The argument returned will be the current binary.
128+
///
127129
/// # Example
128130
///
129131
/// ```rust,no_run
@@ -136,7 +138,7 @@ impl RawArgs {
136138
/// println!("{:?}", paths);
137139
/// ```
138140
pub fn from_args() -> Self {
139-
Self::from_iter(std::env::args_os())
141+
Self::new(std::env::args_os())
140142
}
141143

142144
//// Create an argument list to parse
@@ -145,14 +147,14 @@ impl RawArgs {
145147
///
146148
/// ```rust,no_run
147149
/// # use std::path::PathBuf;
148-
/// let raw = clap_lex::RawArgs::from_iter(["bin", "foo.txt"]);
150+
/// let raw = clap_lex::RawArgs::new(["bin", "foo.txt"]);
149151
/// let mut cursor = raw.cursor();
150152
/// let _bin = raw.next_os(&mut cursor);
151153
///
152154
/// let mut paths = raw.remaining(&mut cursor).map(PathBuf::from).collect::<Vec<_>>();
153155
/// println!("{:?}", paths);
154156
/// ```
155-
pub fn from_iter(iter: impl IntoIterator<Item = impl Into<std::ffi::OsString>>) -> Self {
157+
pub fn new(iter: impl IntoIterator<Item = impl Into<std::ffi::OsString>>) -> Self {
156158
let iter = iter.into_iter();
157159
Self::from(iter)
158160
}
@@ -163,7 +165,7 @@ impl RawArgs {
163165
///
164166
/// ```rust,no_run
165167
/// # use std::path::PathBuf;
166-
/// let raw = clap_lex::RawArgs::from_iter(["bin", "foo.txt"]);
168+
/// let raw = clap_lex::RawArgs::new(["bin", "foo.txt"]);
167169
/// let mut cursor = raw.cursor();
168170
/// let _bin = raw.next_os(&mut cursor);
169171
///
@@ -202,7 +204,7 @@ impl RawArgs {
202204
///
203205
/// ```rust,no_run
204206
/// # use std::path::PathBuf;
205-
/// let raw = clap_lex::RawArgs::from_iter(["bin", "foo.txt"]);
207+
/// let raw = clap_lex::RawArgs::new(["bin", "foo.txt"]);
206208
/// let mut cursor = raw.cursor();
207209
/// let _bin = raw.next_os(&mut cursor);
208210
///
@@ -299,7 +301,7 @@ impl<'s> ParsedArg<'s> {
299301
pub fn to_long(&self) -> Option<(Result<&str, &RawOsStr>, Option<&RawOsStr>)> {
300302
if let Some(raw) = self.utf8 {
301303
let remainder = raw.strip_prefix("--")?;
302-
let (flag, value) = if let Some((p0, p1)) = remainder.split_once("=") {
304+
let (flag, value) = if let Some((p0, p1)) = remainder.split_once('=') {
303305
(p0, Some(p1))
304306
} else {
305307
(remainder, None)
@@ -310,12 +312,12 @@ impl<'s> ParsedArg<'s> {
310312
} else {
311313
let raw = self.inner.as_ref();
312314
let remainder = raw.strip_prefix("--")?;
313-
let (flag, value) = if let Some((p0, p1)) = remainder.split_once("=") {
315+
let (flag, value) = if let Some((p0, p1)) = remainder.split_once('=') {
314316
(p0, Some(p1))
315317
} else {
316318
(remainder, None)
317319
};
318-
let flag = flag.to_str().ok_or_else(|| flag);
320+
let flag = flag.to_str().ok_or(flag);
319321
Some((flag, value))
320322
}
321323
}
@@ -363,7 +365,7 @@ impl<'s> ParsedArg<'s> {
363365
///
364366
/// **NOTE:** May return a flag or an escape.
365367
pub fn to_value(&self) -> Result<&str, &RawOsStr> {
366-
self.utf8.ok_or(self.inner.as_ref())
368+
self.utf8.ok_or_else(|| self.inner.as_ref())
367369
}
368370

369371
/// Safely print an argument that may contain non-UTF8 content

‎clap_lex/tests/lexer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[test]
22
fn insert() {
3-
let mut raw = clap_lex::RawArgs::from_iter(["bin", "a", "b", "c"]);
3+
let mut raw = clap_lex::RawArgs::new(["bin", "a", "b", "c"]);
44
let mut cursor = raw.cursor();
55

66
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
77
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("a")));
8-
raw.insert(&mut cursor, &["1", "2", "3"]);
8+
raw.insert(&cursor, &["1", "2", "3"]);
99
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("1")));
1010
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("2")));
1111
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("3")));

‎clap_lex/tests/parsed.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// the start of a long because there is no valid value to return.
33
#[test]
44
fn to_long_stdio() {
5-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
5+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
66
let mut cursor = raw.cursor();
77
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
88
let next = raw.next(&mut cursor).unwrap();
@@ -14,7 +14,7 @@ fn to_long_stdio() {
1414

1515
#[test]
1616
fn to_long_escape() {
17-
let raw = clap_lex::RawArgs::from_iter(["bin", "--"]);
17+
let raw = clap_lex::RawArgs::new(["bin", "--"]);
1818
let mut cursor = raw.cursor();
1919
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
2020
let next = raw.next(&mut cursor).unwrap();
@@ -28,7 +28,7 @@ fn to_long_escape() {
2828

2929
#[test]
3030
fn to_long_no_value() {
31-
let raw = clap_lex::RawArgs::from_iter(["bin", "--long"]);
31+
let raw = clap_lex::RawArgs::new(["bin", "--long"]);
3232
let mut cursor = raw.cursor();
3333
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
3434
let next = raw.next(&mut cursor).unwrap();
@@ -42,7 +42,7 @@ fn to_long_no_value() {
4242

4343
#[test]
4444
fn to_long_with_empty_value() {
45-
let raw = clap_lex::RawArgs::from_iter(["bin", "--long="]);
45+
let raw = clap_lex::RawArgs::new(["bin", "--long="]);
4646
let mut cursor = raw.cursor();
4747
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
4848
let next = raw.next(&mut cursor).unwrap();
@@ -56,7 +56,7 @@ fn to_long_with_empty_value() {
5656

5757
#[test]
5858
fn to_long_with_value() {
59-
let raw = clap_lex::RawArgs::from_iter(["bin", "--long=hello"]);
59+
let raw = clap_lex::RawArgs::new(["bin", "--long=hello"]);
6060
let mut cursor = raw.cursor();
6161
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
6262
let next = raw.next(&mut cursor).unwrap();
@@ -70,7 +70,7 @@ fn to_long_with_value() {
7070

7171
#[test]
7272
fn to_short_stdio() {
73-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
73+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
7474
let mut cursor = raw.cursor();
7575
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
7676
let next = raw.next(&mut cursor).unwrap();
@@ -83,7 +83,7 @@ fn to_short_stdio() {
8383

8484
#[test]
8585
fn to_short_escape() {
86-
let raw = clap_lex::RawArgs::from_iter(["bin", "--"]);
86+
let raw = clap_lex::RawArgs::new(["bin", "--"]);
8787
let mut cursor = raw.cursor();
8888
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
8989
let next = raw.next(&mut cursor).unwrap();
@@ -95,7 +95,7 @@ fn to_short_escape() {
9595

9696
#[test]
9797
fn to_short_long() {
98-
let raw = clap_lex::RawArgs::from_iter(["bin", "--long"]);
98+
let raw = clap_lex::RawArgs::new(["bin", "--long"]);
9999
let mut cursor = raw.cursor();
100100
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
101101
let next = raw.next(&mut cursor).unwrap();
@@ -107,7 +107,7 @@ fn to_short_long() {
107107

108108
#[test]
109109
fn to_short() {
110-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
110+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
111111
let mut cursor = raw.cursor();
112112
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
113113
let next = raw.next(&mut cursor).unwrap();
@@ -121,7 +121,7 @@ fn to_short() {
121121

122122
#[test]
123123
fn is_negative_number() {
124-
let raw = clap_lex::RawArgs::from_iter(["bin", "-10.0"]);
124+
let raw = clap_lex::RawArgs::new(["bin", "-10.0"]);
125125
let mut cursor = raw.cursor();
126126
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
127127
let next = raw.next(&mut cursor).unwrap();
@@ -131,7 +131,7 @@ fn is_negative_number() {
131131

132132
#[test]
133133
fn is_positive_number() {
134-
let raw = clap_lex::RawArgs::from_iter(["bin", "10.0"]);
134+
let raw = clap_lex::RawArgs::new(["bin", "10.0"]);
135135
let mut cursor = raw.cursor();
136136
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
137137
let next = raw.next(&mut cursor).unwrap();
@@ -141,7 +141,7 @@ fn is_positive_number() {
141141

142142
#[test]
143143
fn is_not_number() {
144-
let raw = clap_lex::RawArgs::from_iter(["bin", "--10.0"]);
144+
let raw = clap_lex::RawArgs::new(["bin", "--10.0"]);
145145
let mut cursor = raw.cursor();
146146
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
147147
let next = raw.next(&mut cursor).unwrap();
@@ -151,7 +151,7 @@ fn is_not_number() {
151151

152152
#[test]
153153
fn is_stdio() {
154-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
154+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
155155
let mut cursor = raw.cursor();
156156
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
157157
let next = raw.next(&mut cursor).unwrap();
@@ -161,7 +161,7 @@ fn is_stdio() {
161161

162162
#[test]
163163
fn is_not_stdio() {
164-
let raw = clap_lex::RawArgs::from_iter(["bin", "--"]);
164+
let raw = clap_lex::RawArgs::new(["bin", "--"]);
165165
let mut cursor = raw.cursor();
166166
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
167167
let next = raw.next(&mut cursor).unwrap();
@@ -171,7 +171,7 @@ fn is_not_stdio() {
171171

172172
#[test]
173173
fn is_escape() {
174-
let raw = clap_lex::RawArgs::from_iter(["bin", "--"]);
174+
let raw = clap_lex::RawArgs::new(["bin", "--"]);
175175
let mut cursor = raw.cursor();
176176
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
177177
let next = raw.next(&mut cursor).unwrap();
@@ -181,7 +181,7 @@ fn is_escape() {
181181

182182
#[test]
183183
fn is_not_escape() {
184-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
184+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
185185
let mut cursor = raw.cursor();
186186
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
187187
let next = raw.next(&mut cursor).unwrap();

‎clap_lex/tests/shorts.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[test]
22
fn iter() {
3-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
3+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
44
let mut cursor = raw.cursor();
55
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
66
let next = raw.next(&mut cursor).unwrap();
@@ -12,7 +12,7 @@ fn iter() {
1212

1313
#[test]
1414
fn next_flag() {
15-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
15+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
1616
let mut cursor = raw.cursor();
1717
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
1818
let next = raw.next(&mut cursor).unwrap();
@@ -31,7 +31,7 @@ fn next_flag() {
3131

3232
#[test]
3333
fn next_value_os() {
34-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
34+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
3535
let mut cursor = raw.cursor();
3636
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
3737
let next = raw.next(&mut cursor).unwrap();
@@ -44,7 +44,7 @@ fn next_value_os() {
4444

4545
#[test]
4646
fn next_flag_with_value() {
47-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
47+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
4848
let mut cursor = raw.cursor();
4949
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
5050
let next = raw.next(&mut cursor).unwrap();
@@ -58,7 +58,7 @@ fn next_flag_with_value() {
5858

5959
#[test]
6060
fn next_flag_with_no_value() {
61-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
61+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
6262
let mut cursor = raw.cursor();
6363
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
6464
let next = raw.next(&mut cursor).unwrap();
@@ -75,7 +75,7 @@ fn next_flag_with_no_value() {
7575

7676
#[test]
7777
fn advance_by_nothing() {
78-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
78+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
7979
let mut cursor = raw.cursor();
8080
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
8181
let next = raw.next(&mut cursor).unwrap();
@@ -89,7 +89,7 @@ fn advance_by_nothing() {
8989

9090
#[test]
9191
fn advance_by_nothing_with_nothing() {
92-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
92+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
9393
let mut cursor = raw.cursor();
9494
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
9595
let next = raw.next(&mut cursor).unwrap();
@@ -103,7 +103,7 @@ fn advance_by_nothing_with_nothing() {
103103

104104
#[test]
105105
fn advance_by_something() {
106-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
106+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
107107
let mut cursor = raw.cursor();
108108
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
109109
let next = raw.next(&mut cursor).unwrap();
@@ -117,7 +117,7 @@ fn advance_by_something() {
117117

118118
#[test]
119119
fn advance_by_out_of_bounds() {
120-
let raw = clap_lex::RawArgs::from_iter(["bin", "-short"]);
120+
let raw = clap_lex::RawArgs::new(["bin", "-short"]);
121121
let mut cursor = raw.cursor();
122122
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
123123
let next = raw.next(&mut cursor).unwrap();
@@ -131,7 +131,7 @@ fn advance_by_out_of_bounds() {
131131

132132
#[test]
133133
fn is_empty() {
134-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
134+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
135135
let mut cursor = raw.cursor();
136136
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
137137
let next = raw.next(&mut cursor).unwrap();
@@ -142,7 +142,7 @@ fn is_empty() {
142142

143143
#[test]
144144
fn is_not_empty() {
145-
let raw = clap_lex::RawArgs::from_iter(["bin", "-hello"]);
145+
let raw = clap_lex::RawArgs::new(["bin", "-hello"]);
146146
let mut cursor = raw.cursor();
147147
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
148148
let next = raw.next(&mut cursor).unwrap();
@@ -153,7 +153,7 @@ fn is_not_empty() {
153153

154154
#[test]
155155
fn is_partial_not_empty() {
156-
let raw = clap_lex::RawArgs::from_iter(["bin", "-hello"]);
156+
let raw = clap_lex::RawArgs::new(["bin", "-hello"]);
157157
let mut cursor = raw.cursor();
158158
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
159159
let next = raw.next(&mut cursor).unwrap();
@@ -165,7 +165,7 @@ fn is_partial_not_empty() {
165165

166166
#[test]
167167
fn is_exhausted_empty() {
168-
let raw = clap_lex::RawArgs::from_iter(["bin", "-"]);
168+
let raw = clap_lex::RawArgs::new(["bin", "-"]);
169169
let mut cursor = raw.cursor();
170170
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
171171
let next = raw.next(&mut cursor).unwrap();
@@ -177,7 +177,7 @@ fn is_exhausted_empty() {
177177

178178
#[test]
179179
fn is_number() {
180-
let raw = clap_lex::RawArgs::from_iter(["bin", "-1.0"]);
180+
let raw = clap_lex::RawArgs::new(["bin", "-1.0"]);
181181
let mut cursor = raw.cursor();
182182
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
183183
let next = raw.next(&mut cursor).unwrap();
@@ -188,7 +188,7 @@ fn is_number() {
188188

189189
#[test]
190190
fn is_not_number() {
191-
let raw = clap_lex::RawArgs::from_iter(["bin", "-hello"]);
191+
let raw = clap_lex::RawArgs::new(["bin", "-hello"]);
192192
let mut cursor = raw.cursor();
193193
assert_eq!(raw.next_os(&mut cursor), Some(std::ffi::OsStr::new("bin")));
194194
let next = raw.next(&mut cursor).unwrap();

‎src/build/command.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ impl<'help> App<'help> {
631631
I: IntoIterator<Item = T>,
632632
T: Into<OsString> + Clone,
633633
{
634-
let mut raw_args = clap_lex::RawArgs::from(itr.into_iter());
634+
let mut raw_args = clap_lex::RawArgs::new(itr.into_iter());
635635
let mut cursor = raw_args.cursor();
636636

637637
#[cfg(feature = "unstable-multicall")]

0 commit comments

Comments
 (0)