Fix lints

Mark-Simulacrum · Mark-Simulacrum · commit 3e35b0c82b63 · 2022-01-07T17:13:45.000-05:00
diff --git a/src/db/mod.rs b/src/db/mod.rs
@@ -30,7 +30,7 @@ impl CustomizeConnection<Connection, ::rusqlite::Error> for ConnectionCustomizer
 pub struct Database {
     pool: Pool<SqliteConnectionManager>,
     // The tempfile is stored here to drop it after all the connections are closed
-    tempfile: Option<Arc<NamedTempFile>>,
+    _tempfile: Option<Arc<NamedTempFile>>,
 }
 
 impl Database {
@@ -76,7 +76,7 @@ impl Database {
 
         Ok(Database {
             pool,
-            tempfile: tempfile.map(Arc::new),
+            _tempfile: tempfile.map(Arc::new),
         })
     }
 
diff --git a/src/runner/test.rs b/src/runner/test.rs
@@ -17,9 +17,9 @@ fn failure_reason(err: &Error) -> FailureReason {
     for cause in err.iter_chain() {
         if let Some(&CommandError::SandboxOOM) = cause.downcast_ctx() {
             return FailureReason::OOM;
-        } else if let Some(&CommandError::NoOutputFor(_)) = cause.downcast_ctx() {
-            return FailureReason::Timeout;
-        } else if let Some(&CommandError::Timeout(_)) = cause.downcast_ctx() {
+        } else if let Some(&CommandError::NoOutputFor(_) | &CommandError::Timeout(_)) =
+            cause.downcast_ctx()
+        {
             return FailureReason::Timeout;
         } else if let Some(reason) = cause.downcast_ctx::<FailureReason>() {
             return reason.clone();
diff --git a/src/server/routes/agent.rs b/src/server/routes/agent.rs
@@ -244,9 +244,7 @@ fn handle_results(resp: Fallible<Response<Body>>) -> Response<Body> {
 fn handle_errors(err: Rejection) -> Result<Response<Body>, Rejection> {
     let error = if let Some(compat) = err.find_cause::<Compat<HttpError>>() {
         Some(*compat.get_ref())
-    } else if let StatusCode::NOT_FOUND = err.status() {
-        Some(HttpError::NotFound)
-    } else if let StatusCode::METHOD_NOT_ALLOWED = err.status() {
+    } else if let StatusCode::NOT_FOUND | StatusCode::METHOD_NOT_ALLOWED = err.status() {
         Some(HttpError::NotFound)
     } else {
         None

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ impl CustomizeConnection<Connection, ::rusqlite::Error> for ConnectionCustomizer`
`30`	`30`	`pub struct Database {`
`31`	`31`	`pool: Pool<SqliteConnectionManager>,`
`32`	`32`	`// The tempfile is stored here to drop it after all the connections are closed`
`33`		`- tempfile: Option<Arc<NamedTempFile>>,`
	`33`	`+ _tempfile: Option<Arc<NamedTempFile>>,`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`impl Database {`
`@@ -76,7 +76,7 @@ impl Database {`
`76`	`76`
`77`	`77`	`Ok(Database {`
`78`	`78`	`pool,`
`79`		`- tempfile: tempfile.map(Arc::new),`
	`79`	`+ _tempfile: tempfile.map(Arc::new),`
`80`	`80`	`})`
`81`	`81`	`}`
`82`	`82`