andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

Fix deprecation warnings for chrono 0.4.23 (#4738)

Browse Source 
Co-authored-by: dxtr <dxtr@W540.mito>
This commit is contained in:
dxtr85 2022-11-15 20:08:29 +01:00 committed by GitHub
parent df6d04425d
commit 888368dae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helix-core/src/increment/date_time.rs
View File

@ -74,12 +74,12 @@ pub fn from_range(text: RopeSlice, range: Range) -> Option<DateTimeIncrementor>
(true, false) => { (true, false) => {
let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?; let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;
date.and_hms(0, 0, 0) date.and_hms_opt(0, 0, 0).unwrap()
} }
(false, true) => { (false, true) => {
let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?; let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;
NaiveDate::from_ymd(0, 1, 1).and_time(time) NaiveDate::from_ymd_opt(0, 1, 1).unwrap().and_time(time)
} }
(false, false) => return None, (false, false) => return None,
}; };
@ -312,10 +312,10 @@ fn ndays_in_month(year: i32, month: u32) -> u32 {
} else { } else {
(year, month + 1) (year, month + 1)
}; };
let d = NaiveDate::from_ymd(y, m, 1); let d = NaiveDate::from_ymd_opt(y, m, 1).unwrap();
// ...is preceded by the last day of the original month. // ...is preceded by the last day of the original month.
d.pred().day() d.pred_opt().unwrap().day()
} }
fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> { fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
@ -334,7 +334,7 @@ fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
let day = cmp::min(date_time.day(), ndays_in_month(year, month)); let day = cmp::min(date_time.day(), ndays_in_month(year, month));
Some(NaiveDate::from_ymd(year, month, day).and_time(date_time.time())) NaiveDate::from_ymd_opt(year, month, day).map(|date| date.and_time(date_time.time()))
} }
fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> { fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
@ -342,8 +342,8 @@ fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
let ndays = ndays_in_month(year, date_time.month()); let ndays = ndays_in_month(year, date_time.month());
if date_time.day() > ndays { if date_time.day() > ndays {
let d = NaiveDate::from_ymd(year, date_time.month(), ndays); NaiveDate::from_ymd_opt(year, date_time.month(), ndays)
Some(d.succ().and_time(date_time.time())) .and_then(|date| date.succ_opt().map(|date| date.and_time(date_time.time())))
} else { } else {
date_time.with_year(year) date_time.with_year(year)
} }