Skip to content

Commit 4d703ae

Browse files
authored
Clippy fixes (#199)
1 parent 9629131 commit 4d703ae

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

server/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ fn startup_sync() {
138138
};
139139

140140
let last_modified = FileTime::from_last_modification_time(&metadata);
141-
let last_modified = NaiveDateTime::from_timestamp(last_modified.unix_seconds(), 0);
142-
let last_modified: DateTime<Utc> = DateTime::from_utc(last_modified, Utc);
141+
let last_modified = NaiveDateTime::from_timestamp_opt(last_modified.unix_seconds(), 0);
142+
let last_modified: DateTime<Utc> = DateTime::from_utc(last_modified.unwrap(), Utc);
143143

144-
let uri = utils::date_to_prefix(last_modified.date())
144+
let uri = utils::date_to_prefix(last_modified.date_naive())
145145
+ &utils::hour_to_prefix(last_modified.hour())
146146
+ &utils::minute_to_prefix(
147147
last_modified.minute(),

server/src/storage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ impl StorageSync {
312312

313313
fn move_local_to_temp(&self) -> io::Result<()> {
314314
let time = self.time - Duration::minutes(OBJECT_STORE_DATA_GRANULARITY as i64);
315-
let uri = utils::date_to_prefix(time.date())
315+
let uri = utils::date_to_prefix(time.date_naive())
316316
+ &utils::hour_to_prefix(time.hour())
317317
+ &utils::minute_to_prefix(time.minute(), OBJECT_STORE_DATA_GRANULARITY).unwrap();
318318
let local_uri = str::replace(&uri, "/", ".");

server/src/utils.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
use actix_web::web;
20-
use chrono::{Date, DateTime, Timelike, Utc};
20+
use chrono::{DateTime, NaiveDate, Timelike, Utc};
2121
use serde_json::{json, Value};
2222
use std::collections::HashMap;
2323

@@ -209,7 +209,7 @@ pub fn minute_to_slot(minute: u32, data_granularity: u32) -> Option<String> {
209209
Some(format!("{:02}-{:02}", block_start, block_end))
210210
}
211211

212-
pub fn date_to_prefix(date: Date<Utc>) -> String {
212+
pub fn date_to_prefix(date: NaiveDate) -> String {
213213
let date = format!("date={}/", date);
214214
date.replace("UTC", "")
215215
}
@@ -247,8 +247,8 @@ impl TimePeriod {
247247

248248
self.generate_date_prefixes(
249249
&prefix,
250-
self.start.date(),
251-
self.end.date(),
250+
self.start.date_naive(),
251+
self.end.date_naive(),
252252
(self.start.hour(), self.start.minute()),
253253
(self.end.hour(), end_minute),
254254
)
@@ -341,8 +341,8 @@ impl TimePeriod {
341341
pub fn generate_date_prefixes(
342342
&self,
343343
prefix: &str,
344-
start_date: Date<Utc>,
345-
end_date: Date<Utc>,
344+
start_date: NaiveDate,
345+
end_date: NaiveDate,
346346
start_time: (u32, u32),
347347
end_time: (u32, u32),
348348
) -> Vec<String> {

0 commit comments

Comments
 (0)