Skip to content

Commit

Permalink
Merge pull request #2697 from dennisschagt/update-chrono-fix-warnings
Browse files Browse the repository at this point in the history
Update to chrono 0.4.35
  • Loading branch information
dennisschagt committed Mar 9, 2024
2 parents 8784c2e + d2f1db3 commit 0573564
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ task:
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
- pkg update -f
- pkg upgrade -y
- pkg install -y rust gmake rubygem-asciidoctor pkgconf stfl curl json-c ncurses openssl sqlite3 gettext-tools libxml2
- pkg install -y rust gmake rubygem-asciidoctor pkgconf stfl curl json-c ncurses openssl ca_root_nss sqlite3 gettext-tools libxml2
setup_script:
- pw groupadd testgroup
- pw useradd testuser -g testgroup -w none -m
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions rust/libnewsboat/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ macro_rules! log {
mod tests {
use super::*;

use chrono::{Duration, NaiveDateTime};
use chrono::{NaiveDateTime, TimeDelta};
use std::io::{self, BufRead, BufReader};
use std::path;
use tempfile::TempDir;
Expand Down Expand Up @@ -499,7 +499,7 @@ mod tests {
// `start_time` and `end_time` may have millisecond precision or better,
// whereas `timestamp` is limited to seconds. Therefore, we account for
// a situation where `start_time` is slightly bigger than `timestamp`.
assert!(timestamp - start_time > Duration::seconds(-1));
assert!(timestamp - start_time > TimeDelta::try_seconds(-1).unwrap());
assert!(finish_time >= timestamp);

assert_eq!(message, expected);
Expand Down Expand Up @@ -830,7 +830,7 @@ mod tests {
// `start_time` and `end_time` may have millisecond precision or better,
// whereas `timestamp` is limited to seconds. Therefore, we account for
// a situation where `start_time` is slightly bigger than `timestamp`.
assert!(timestamp - start_time > Duration::seconds(-1));
assert!(timestamp - start_time > TimeDelta::try_seconds(-1).unwrap());
assert!(finish_time >= timestamp);

assert_eq!(message, expected);
Expand Down

0 comments on commit 0573564

Please sign in to comment.