From 568dbb65de4246fe01adf72791dcf11520ada3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Sun, 8 Sep 2024 01:03:47 +0200 Subject: [PATCH] Update to 2024b --- Makefile | 2 +- make-tzdb/src/main.rs | 5 +++++ tzdb.tar.lz.sha | 2 +- tzdb_data/Cargo.toml | 2 +- tzdb_data/src/generated | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cf6db9e..4568bbc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DELETE_ON_ERROR: -TZDB_VERSION := tzdb-2024a +TZDB_VERSION := tzdb-2024b tzdb_data/src/generated/mod.rs: tmp/${TZDB_VERSION}/usr/share/zoneinfo/ tzdb.tar.lz.sha cd make-tzdb && cargo r -- ../$(@D) ../$< ../tzdb.tar.lz.sha diff --git a/make-tzdb/src/main.rs b/make-tzdb/src/main.rs index 56bced5..9d1c219 100644 --- a/make-tzdb/src/main.rs +++ b/make-tzdb/src/main.rs @@ -164,6 +164,7 @@ fn gen_mod(args: &mut impl Iterator, target_dir: &Path) -> Result // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#![allow(unknown_lints)] #![allow(clippy::pedantic)] #[cfg(all(test, not(miri)))] @@ -183,6 +184,7 @@ pub const VERSION: &str = {version:?}; /// The SHA512 hash of the source Time Zone Database (using the "Complete Distribution") pub const VERSION_HASH: &str = {hash:?}; +#[allow(unreachable_pub)] // false positive pub use self::tz_names::TZ_NAMES; "# ); @@ -275,6 +277,9 @@ fn collect_entries_by_bytes(args: &mut impl Iterator) -> anyhow:: fn gen_raw_tzdata(entries_by_bytes: IndexMap, Vec>, target_dir: &Path) -> anyhow::Result<()> { let mut r = GENERATED_FILE.to_owned(); + writeln!(r, "#![allow(unknown_lints)]")?; + writeln!(r, "#![allow(clippy::octal_escapes)]")?; + writeln!(r)?; for (bytes, entries) in &entries_by_bytes { writeln!( r, diff --git a/tzdb.tar.lz.sha b/tzdb.tar.lz.sha index 77eb276..482ba74 100644 --- a/tzdb.tar.lz.sha +++ b/tzdb.tar.lz.sha @@ -1 +1 @@ -f1a3b06ea2b28a0bf968b75f3674f3b64d8226338d42e2ed17aea33e34bff0f9a7a22f4116612e6c81b9b7b57deaee6ed01a6881000fa1042a7f4390b55a1856 tmp/tzdb-2024a.tar.lz +72446e5cf445515512437c8deaae3063b093aab9620d6441cafaa9b3b71603c857f7ba53557579595788bbc901cd6142404b4db6b0e9f2b23d57b2b3cbc837a8 tmp/tzdb-2024b.tar.lz diff --git a/tzdb_data/Cargo.toml b/tzdb_data/Cargo.toml index ff270ae..79f3ccb 100644 --- a/tzdb_data/Cargo.toml +++ b/tzdb_data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tzdb_data" -version = "0.1.2" +version = "0.1.3" edition = "2018" authors = ["René Kijewski "] repository = "https://github.com/Kijewski/tzdb" diff --git a/tzdb_data/src/generated b/tzdb_data/src/generated index 1999874..e04be62 160000 --- a/tzdb_data/src/generated +++ b/tzdb_data/src/generated @@ -1 +1 @@ -Subproject commit 1999874f2102ff66a24132022b8c840d753bd639 +Subproject commit e04be62b599f2f417327f58680a30ee1c3b370a4