use start time instead of end time; sort results in csv

Author: zekroTJA

src/main.rs

@@ -114,6 +114,7 @@ fn main() -> Result<()> {
     });
 
     let mut res = res?;
+    res.sort_by_key(|r| r.timestamp);
 
     if let Some(path) = args.output {
         let f = get_output_file(&path)?;
@@ -123,7 +124,7 @@ fn main() -> Result<()> {
     if args.csv {
         write_csv(io::stdout(), &res)?;
     } else if !args.silent {
-        res.sort();
+        res.sort_by_key(|r| r.took);
         print_stats(&res);
     }
 
@@ -170,8 +171,8 @@ fn print_stats(res: &[Response]) {
 
     let n = res.len() as f64;
 
-    let min = res.iter().min();
-    let max = res.iter().max();
+    let min = res.iter().min_by_key(|r| r.took);
+    let max = res.iter().max_by_key(|r| r.took);
 
     let min_t = min.unwrap().took;
     let min_s = min.unwrap().status;

src/request.rs

@@ -7,25 +7,13 @@ use reqwest::{
 };
 use std::time::{Duration, Instant};
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 pub struct Response {
     pub status: StatusCode,
     pub took: Duration,
     pub timestamp: DateTime<Utc>,
 }
 
-impl Ord for Response {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.took.cmp(&other.took)
-    }
-}
-
-impl PartialOrd for Response {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.took.partial_cmp(&other.took)
-    }
-}
-
 pub struct Client {
     client: reqwest::blocking::Client,
     url: Url,
@@ -53,14 +41,15 @@ impl Client {
     pub fn send(&self) -> Result<Response> {
         let req = self.create_request();
 
+        let started = Utc::now();
         let before = Instant::now();
         let res = self.client.execute(req)?;
         let after = Instant::now();
 
         Ok(Response {
             status: res.status(),
             took: after - before,
-            timestamp: Utc::now(),
+            timestamp: started,
         })
     }