[librsvg: 3/4] Express `Result.and_then(|x| Ok(y))` as `map(|x| y)`
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/4] Express `Result.and_then(|x| Ok(y))` as `map(|x| y)`
- Date: Mon, 24 Aug 2020 15:34:56 +0000 (UTC)
commit 9ac1bb777cff61453f1b4a1dd276f4e784989d64
Author: Sven Neumann <sven svenfoo org>
Date: Mon Aug 24 15:02:42 2020 +0200
Express `Result.and_then(|x| Ok(y))` as `map(|x| y)`
See https://rust-lang.github.io/rust-clippy/master/index.html#bind_instead_of_map
These changes may be disputable as they remove FIXME comments without actually
fixing them.
rsvg_internals/src/number_list.rs | 5 +----
rsvg_internals/src/parsers.rs | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/rsvg_internals/src/number_list.rs b/rsvg_internals/src/number_list.rs
index f738cd62..8675de47 100644
--- a/rsvg_internals/src/number_list.rs
+++ b/rsvg_internals/src/number_list.rs
@@ -63,10 +63,7 @@ impl NumberList {
let mut input = ParserInput::new(s);
let mut parser = Parser::new(&mut input);
- Self::parse(&mut parser, length).and_then(|r| {
- // FIXME: parser.expect_exhausted()?;
- Ok(r)
- })
+ Self::parse(&mut parser, length).map(|r| r)
}
}
diff --git a/rsvg_internals/src/parsers.rs b/rsvg_internals/src/parsers.rs
index 80b6f8cf..9e9b794f 100644
--- a/rsvg_internals/src/parsers.rs
+++ b/rsvg_internals/src/parsers.rs
@@ -21,10 +21,7 @@ pub trait Parse: Sized {
let mut input = ParserInput::new(s);
let mut parser = Parser::new(&mut input);
- Self::parse(&mut parser).and_then(|r| {
- // FIXME: parser.expect_exhausted()?;
- Ok(r)
- })
+ Self::parse(&mut parser).map(|r| r)
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]