itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-09-30 22:42:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #605 from quodlibetor/ci-update-old-ubuntu

Browse Source
This commit is contained in:
Brandon W Maister 2021-10-18 22:15:45 -04:00 committed by GitHub
commit 61ee2fc9af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-release.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-18.04, ubuntu-latest, macos-latest, windows-latest]
rust_version: [stable]
include:
# check all tzs on most-recent OS's
@ -30,7 +30,7 @@ jobs:
rust_version: beta
- os: ubuntu-latest
rust_version: nightly
- os: ubuntu-16.04
- os: ubuntu-18.04
rust_version: 1.13.0
- os: macos-latest
rust_version: 1.13.0

4
.github/workflows/test.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-18.04, ubuntu-latest, macos-latest, windows-latest]
rust_version: [stable]
exhaustive_tz: [onetz]
check_combinatoric: [no_combinatoric]
@ -38,7 +38,7 @@ jobs:
rust_version: beta
- os: ubuntu-latest
rust_version: nightly
- os: ubuntu-16.04
- os: ubuntu-18.04
rust_version: 1.13.0
- os: macos-latest
rust_version: 1.13.0

3
src/format/mod.rs
View File

@ -744,6 +744,9 @@ pub struct DelayedFormat<I> {
/// An iterator returning formatting items.
items: I,
/// Locale used for text.
// TODO: Only used with the locale feature. We should make this property
// only present when the feature is enabled.
#[allow(dead_code)]
locale: Option<Locale>,
}

2
src/naive/datetime.rs
View File

@ -2307,7 +2307,7 @@ mod tests {
result.map(|(y, m, d, h, n, s)| NaiveDate::from_ymd(y, m, d).and_hms(h, n, s));
assert_eq!(lhs.checked_add_signed(rhs), sum);
assert_eq!(lhs.checked_sub_signed(-rhs), sum);
};
}
check(
(2014, 5, 6, 7, 8, 9),

2
src/naive/internals.rs
View File

@ -338,6 +338,7 @@ impl Of {
(weekord / 7, Weekday::from_u32(weekord % 7).unwrap())
}
#[cfg_attr(feature = "cargo-clippy", allow(wrong_self_convention))]
#[inline]
pub fn to_mdf(&self) -> Mdf {
Mdf::from_of(*self)
@ -460,6 +461,7 @@ impl Mdf {
Mdf((mdf & !0b1111) | u32::from(flags))
}
#[cfg_attr(feature = "cargo-clippy", allow(wrong_self_convention))]
#[inline]
pub fn to_of(&self) -> Of {
Of::from_mdf(*self)