From 2be65d069e7fbaac10a81f73bddd6d88a1f51600 Mon Sep 17 00:00:00 2001
From: Yuheng Chen <yuhengchen@sensetime.com>
Date: Mon, 1 Jun 2020 20:34:13 +0800
Subject: [PATCH] fix CI for clippy 0.9

---
 parser/.travis.yml |  2 +-
 parser/src/yaml.rs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/parser/.travis.yml b/parser/.travis.yml
index 9e453f3..46b9569 100644
--- a/parser/.travis.yml
+++ b/parser/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     - rust: stable
     - rust: beta
     - rust: nightly
-    - rust: 1.31.0
+    - rust: 1.33.0
     - rust: nightly
       env: CLIPPY
       script: |
diff --git a/parser/src/yaml.rs b/parser/src/yaml.rs
index f529f38..d783282 100644
--- a/parser/src/yaml.rs
+++ b/parser/src/yaml.rs
@@ -288,19 +288,19 @@ impl Yaml {
     // This function falls back to Yaml::String if nothing else matches.
     pub fn from_str(v: &str) -> Yaml {
         if v.starts_with("0x") {
-            let n = i64::from_str_radix(&v[2..], 16);
-            if n.is_ok() {
-                return Yaml::Integer(n.unwrap());
+            if let Ok(i) = i64::from_str_radix(&v[2..], 16) {
+                return Yaml::Integer(i);
             }
         }
         if v.starts_with("0o") {
-            let n = i64::from_str_radix(&v[2..], 8);
-            if n.is_ok() {
-                return Yaml::Integer(n.unwrap());
+            if let Ok(i) = i64::from_str_radix(&v[2..], 8) {
+                return Yaml::Integer(i);
             }
         }
-        if v.starts_with('+') && v[1..].parse::<i64>().is_ok() {
-            return Yaml::Integer(v[1..].parse::<i64>().unwrap());
+        if v.starts_with('+') {
+            if let Ok(i) = v[1..].parse::<i64>() {
+                return Yaml::Integer(i);
+            }
         }
         match v {
             "~" | "null" => Yaml::Null,