diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-10-01 13:43:30 +0900 |
|---|---|---|
| committer | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-10-01 23:15:47 +0900 |
| commit | f10d2e2d23e6a47bb7d3df17d4fbe067f8c99ea9 (patch) | |
| tree | 4e2704568b0d3adde476e9000727b7a0f647b614 /src/libserialize | |
| parent | 22bc9e1d9ca49ee4f5cd953088ab09c238a6dd26 (diff) | |
| download | rust-f10d2e2d23e6a47bb7d3df17d4fbe067f8c99ea9.tar.gz rust-f10d2e2d23e6a47bb7d3df17d4fbe067f8c99ea9.zip | |
Fix clippy warnings
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index d0007074a82..d2e360f5e20 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1053,12 +1053,12 @@ impl Json { /// a value associated with the provided key is found. If no value is found /// or the Json value is not an Object, returns `None`. pub fn search(&self, key: &str) -> Option<&Json> { - match self { - &Json::Object(ref map) => { + match *self { + Json::Object(ref map) => { match map.get(key) { Some(json_value) => Some(json_value), None => { - for (_, v) in map { + for v in map.values() { match v.search(key) { x if x.is_some() => return x, _ => () @@ -1487,12 +1487,12 @@ impl<T: Iterator<Item=char>> Parser<T> { } fn parse_number(&mut self) -> JsonEvent { - let mut neg = false; - - if self.ch_is('-') { + let neg = if self.ch_is('-') { self.bump(); - neg = true; - } + true + } else { + false + }; let res = match self.parse_u64() { Ok(res) => res, @@ -2162,10 +2162,9 @@ impl crate::Decoder for Decoder { let s = self.read_str()?; { let mut it = s.chars(); - match (it.next(), it.next()) { + if let (Some(c), None) = (it.next(), it.next()) { // exactly one character - (Some(c), None) => return Ok(c), - _ => () + return Ok(c); } } Err(ExpectedError("single character string".to_owned(), s.to_string())) |
