Skip to content

Commit d71d738

Browse files
committed
Keep fmt happy
- Add a Default attribute - Accept linter changes
1 parent 1931ab2 commit d71d738

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/frontend/http.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ use warp::multipart::{FormData, Part};
3434
use warp::reply::{with_header, Response};
3535
use warp::{hyper::header, hyper::StatusCode, Filter, Reply};
3636

37+
use super::http_utils::{handle_rejection, into_response, ApiError};
3738
use crate::auth::{token_to_principal, AccessPolicy, Action, UserContext};
3839
use crate::catalog::DEFAULT_DB;
3940
use crate::config::schema::{AccessSettings, MEBIBYTES};
41+
use crate::frontend::profile_utils::Timer;
4042
use crate::{
4143
config::schema::{str_to_hex_hash, HttpFrontend},
4244
context::{
4345
is_read_only, is_statement_read_only, DefaultSeafowlContext, SeafowlContext,
4446
},
4547
};
46-
use crate::frontend::profile_utils::Timer;
47-
use super::http_utils::{handle_rejection, into_response, ApiError};
4848

4949
const QUERY_HEADER: &str = "X-Seafowl-Query";
5050
const BEARER_PREFIX: &str = "Bearer ";

src/frontend/profile_utils.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ use std::time::{Duration, Instant};
55
// Use Option as a safeguard because apparently previous Rust versions panicked
66
// when current time was earlier than self.
77

8+
#[derive(Default)]
89
pub struct Timer {
910
start_time: Option<Instant>,
1011
}
1112

1213
impl Timer {
1314
pub fn new() -> Self {
14-
Self {
15-
start_time: None
16-
}
15+
Self { start_time: None }
1716
}
1817

1918
pub fn start_timer(&mut self) {
@@ -25,10 +24,11 @@ impl Timer {
2524
}
2625

2726
pub fn formatted_elapsed(&self) -> String {
28-
self.elapsed().map(|duration| {
29-
let millis = duration.as_millis();
30-
format!("{}", millis)
31-
})
32-
.unwrap_or_else(|| String::new())
27+
self.elapsed()
28+
.map(|duration| {
29+
let millis = duration.as_millis();
30+
format!("{}", millis)
31+
})
32+
.unwrap_or_else(String::new)
3333
}
3434
}

0 commit comments

Comments
 (0)