Mercurial > lbo > hg > geohub

changeset 31:7559c75bb43c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove superfluous type declarations
author Lewin Bormann <lbo@spheniscida.de>
date Thu, 03 Dec 2020 00:02:58 +0100
parents f697356d93ae
children f7123f6d7ae9
files src/db.rs src/main.rs
diffstat 2 files changed, 5 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/db.rs	Thu Dec 03 00:01:48 2020 +0100
+++ b/src/db.rs	Thu Dec 03 00:02:58 2020 +0100
@@ -29,14 +29,7 @@
             let mut last = 0;
 
             for row in rows.iter() {
-                let (id, ts, lat, long, spd, ele): (
-                    i32,
-                    chrono::DateTime<chrono::Utc>,
-                    Option<f64>,
-                    Option<f64>,
-                    Option<f64>,
-                    Option<f64>,
-                ) = (
+                let (id, ts, lat, long, spd, ele) = (
                     row.get(0),
                     row.get(1),
                     row.get(2),
@@ -61,4 +54,3 @@
     }
     return None;
 }
-
--- a/src/main.rs	Thu Dec 03 00:01:48 2020 +0100
+++ b/src/main.rs	Thu Dec 03 00:02:58 2020 +0100
@@ -5,15 +5,14 @@
 mod notifier;
 mod types;
 
+use std::sync::{mpsc, Arc, Mutex};
 use std::time;
-use std::sync::{mpsc, Arc, Mutex};
 
 use postgres;
 use rocket;
 
 use chrono::TimeZone;
 
-
 #[rocket_contrib::database("geohub")]
 struct DBConn(postgres::Connection);
 
@@ -89,7 +88,7 @@
     name: String,
     secret: Option<String>,
     timeout: Option<u64>,
-) -> rocket_contrib::json::Json<LiveUpdate>  {
+) -> rocket_contrib::json::Json<LiveUpdate> {
     if !ids::name_and_secret_acceptable(name.as_str(), secret.as_ref().map(|s| s.as_str())) {
         return rocket_contrib::json::Json(LiveUpdate {
             typ: "GeoHubUpdate".into(),
@@ -163,13 +162,8 @@
     if let Ok(rows) = rows {
         returnable.features = Vec::with_capacity(rows.len());
         for row in rows.iter() {
-            let (ts, lat, long, spd, ele): (
-                chrono::DateTime<chrono::Utc>,
-                Option<f64>,
-                Option<f64>,
-                Option<f64>,
-                Option<f64>,
-            ) = (row.get(0), row.get(1), row.get(2), row.get(3), row.get(4));
+            let (ts, lat, long, spd, ele) =
+                (row.get(0), row.get(1), row.get(2), row.get(3), row.get(4));
             returnable
                 .features
                 .push(types::geofeature_from_row(ts, lat, long, spd, ele));