Skip to content

Commit b29fab6

Browse files
committed
cargo clippy --fix
1 parent c9e0a5e commit b29fab6

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/bin/undname.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ fn main() {
88
let mut args: Vec<_> = env::args().collect();
99
args.remove(0);
1010

11-
let verbose = if args.get(0).map(|x| x.as_str()) == Some("-v") {
11+
let verbose = if args.first().map(|x| x.as_str()) == Some("-v") {
1212
args.remove(0);
1313
true
1414
} else {
1515
false
1616
};
1717

1818
let print_demangled = |sym: &str| {
19-
let parsed = match msvc_demangler::parse(&sym) {
19+
let parsed = match msvc_demangler::parse(sym) {
2020
Ok(parsed) => parsed,
2121
Err(err) => {
2222
eprintln!("error: {}", err);

src/lib.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ impl From<std::io::Error> for Error {
116116
impl error::Error for Error {
117117
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
118118
match self.repr {
119-
ErrorRepr::FromUtf8(ref e) => Some(&*e),
120-
ErrorRepr::Utf8(ref e) => Some(&*e),
121-
ErrorRepr::Io(ref e) => Some(&*e),
119+
ErrorRepr::FromUtf8(ref e) => Some(e),
120+
ErrorRepr::Utf8(ref e) => Some(e),
121+
ErrorRepr::Io(ref e) => Some(e),
122122
ErrorRepr::ParseError(..) => None,
123123
ErrorRepr::Other(_) => None,
124124
}
@@ -724,7 +724,7 @@ impl<'a> ParserState<'a> {
724724
fn read_digit(&mut self) -> Option<u8> {
725725
match self.peek() {
726726
Some(first) => {
727-
if char::from(first).is_digit(10) {
727+
if char::from(first).is_ascii_digit() {
728728
self.advance(1);
729729
Some(first - b'0')
730730
} else {
@@ -738,7 +738,7 @@ impl<'a> ParserState<'a> {
738738
fn read_hex_digit(&mut self) -> Option<char> {
739739
match self.peek() {
740740
Some(first) => {
741-
if char::from(first).is_digit(16) {
741+
if char::from(first).is_ascii_hexdigit() {
742742
self.advance(1);
743743
Some(first as char)
744744
} else {
@@ -1562,7 +1562,7 @@ pub fn serialize(input: &ParseResult, flags: DemangleFlags) -> Result<String> {
15621562
let mut s = Vec::new();
15631563
{
15641564
let mut serializer = Serializer { flags, w: &mut s };
1565-
serializer.serialize(&input)?;
1565+
serializer.serialize(input)?;
15661566
}
15671567
Ok(String::from_utf8(s)?)
15681568
}
@@ -2214,7 +2214,7 @@ impl<'a> Serializer<'a> {
22142214

22152215
fn write_one_name(&mut self, name: &Name) -> Result<()> {
22162216
match *name {
2217-
Name::Md5(ref name) => {
2217+
Name::Md5(name) => {
22182218
write!(self.w, "??@")?;
22192219
self.w.write_all(name)?;
22202220
write!(self.w, "@")?;
@@ -2223,17 +2223,17 @@ impl<'a> Serializer<'a> {
22232223
self.write_space()?;
22242224
self.write_operator_name(op)?;
22252225
}
2226-
Name::NonTemplate(ref name) => {
2226+
Name::NonTemplate(name) => {
22272227
self.w.write_all(name)?;
22282228
}
2229-
Name::AsInterface(ref name) => {
2229+
Name::AsInterface(name) => {
22302230
write!(self.w, "[")?;
22312231
self.w.write_all(name)?;
22322232
write!(self.w, "]")?;
22332233
}
22342234
Name::Template(ref name, ref params) => {
22352235
self.write_one_name(name)?;
2236-
self.write_tmpl_params(&params)?;
2236+
self.write_tmpl_params(params)?;
22372237
}
22382238
Name::Discriminator(ref val) => {
22392239
write!(self.w, "`{}'", val)?;
@@ -2252,11 +2252,11 @@ impl<'a> Serializer<'a> {
22522252
// Print out namespaces or outer class names.
22532253
let mut i = names.names.iter().rev();
22542254
if let Some(name) = i.next() {
2255-
self.write_one_name(&name)?;
2255+
self.write_one_name(name)?;
22562256
}
22572257
for name in i {
22582258
write!(self.w, "::")?;
2259-
self.write_one_name(&name)?;
2259+
self.write_one_name(name)?;
22602260
}
22612261
Ok(())
22622262
}
@@ -2283,23 +2283,23 @@ impl<'a> Serializer<'a> {
22832283
}
22842284

22852285
match names.name {
2286-
Name::Md5(ref name) => {
2286+
Name::Md5(name) => {
22872287
write!(self.w, "??@")?;
22882288
self.w.write_all(name)?;
22892289
write!(self.w, "@")?;
22902290
}
22912291
Name::Operator(ref op) => {
22922292
match *op {
22932293
Operator::Ctor => {
2294-
let prev = names.scope.names.get(0).ok_or_else(|| {
2294+
let prev = names.scope.names.first().ok_or_else(|| {
22952295
Error::new(
22962296
"If there's a ctor, there should be another name in this sequence",
22972297
)
22982298
})?;
22992299
self.write_one_name(prev)?;
23002300
}
23012301
Operator::Dtor => {
2302-
let prev = names.scope.names.get(0).ok_or_else(|| {
2302+
let prev = names.scope.names.first().ok_or_else(|| {
23032303
Error::new(
23042304
"If there's a dtor, there should be another name in this sequence",
23052305
)
@@ -2330,17 +2330,17 @@ impl<'a> Serializer<'a> {
23302330
}
23312331
}
23322332
}
2333-
Name::NonTemplate(ref name) => {
2333+
Name::NonTemplate(name) => {
23342334
self.w.write_all(name)?;
23352335
}
2336-
Name::AsInterface(ref name) => {
2336+
Name::AsInterface(name) => {
23372337
write!(self.w, "[")?;
23382338
self.w.write_all(name)?;
23392339
write!(self.w, "]")?;
23402340
}
23412341
Name::Template(ref name, ref params) => {
23422342
self.write_one_name(name)?;
2343-
self.write_tmpl_params(&params)?;
2343+
self.write_tmpl_params(params)?;
23442344
}
23452345
Name::Discriminator(ref val) => {
23462346
write!(self.w, "`{}'", val)?;
@@ -2356,7 +2356,7 @@ impl<'a> Serializer<'a> {
23562356
Ok(())
23572357
}
23582358

2359-
fn write_tmpl_params<'b>(&mut self, params: &Params<'b>) -> Result<()> {
2359+
fn write_tmpl_params(&mut self, params: &Params<'_>) -> Result<()> {
23602360
write!(self.w, "<")?;
23612361
if !params.types.is_empty() {
23622362
self.write_types(&params.types)?;

0 commit comments

Comments
 (0)