Fix lookup error for names containing underscores (#50)

Fixes issue #49.

Author: Kijewski

CHANGELOG.md

@@ -1,8 +1,12 @@
 ## Changes between the versions
 
-### 0.2.1
+### 0.2.3
+
+* Fix lookup error for names containing underscores
+
+### 0.2.2
 
-* Bump dependency version numbers
+* Bump dependency versions
 
 ### 0.2.1
 

Cargo.lock

@@ -4,7 +4,7 @@ TZDB_VERSION := tzdb-2022a
 
 tzdb/src/generated.rs: tmp/${TZDB_VERSION}/usr/share/zoneinfo/
 	cargo r --bin make-tzdb -- $@ $<
-	cargo fmt
+	cargo +nightly fmt -- $@
 
 tmp/${TZDB_VERSION}/usr/share/zoneinfo/: tmp/${TZDB_VERSION}/
 	cd tmp/${TZDB_VERSION}/ && make PACKRATDATA=backzone TOPDIR="." install

Makefile

@@ -6,13 +6,16 @@ authors = ["René Kijewski <crates.io@k6i.de>"]
 repository = "https://github.com/Kijewski/tzdb"
 description = "Tool to generate `tzdb/src/generated.rs`"
 license = "MIT OR Apache-2.0"
+publish = false
 
 [dependencies]
-anyhow = "1.0.56"
-convert_case = "0.5.0"
-indexmap = "1.8.1"
-itertools = "0.10.3"
-phf_codegen = "0.10.0"
-ron = "0.7.0"
-serde = { version = "1.0.136", features = ["derive"] }
-tz-rs = "0.6.9"
+anyhow = "=1"
+byte-slice-cast = "=1"
+convert_case = "=0.5"
+indexmap = "=1"
+itertools = "=0.10"
+phf_codegen = "=0.10"
+phf_shared = "=0.10"
+ron = "=0.7"
+serde = { version = "=1", features = ["derive"] }
+tz-rs = "=0.6"

make-tzdb/Cargo.toml

@@ -14,6 +14,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[path = "../../tzdb/src/lower.rs"]
+mod lower;
 mod parse;
 
 use std::cmp::Ordering;
@@ -27,6 +29,8 @@ use indexmap::IndexMap;
 use itertools::Itertools;
 use tz::TimeZone;
 
+use crate::lower::full_to_lower;
+
 struct TzName {
     /// to_pascal("Europe/Belfast")
     canon: String,
@@ -198,6 +202,8 @@ pub fn main() -> anyhow::Result<()> {
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 use tz::TimeZoneRef;
+#[cfg(feature = "by-name")]
+use crate::lower::Lower;
 "#
     )?;
 
@@ -253,7 +259,7 @@ use tz::TimeZoneRef;
     for entries in entries_by_bytes.values() {
         for entry in entries {
             phf.entry(
-                entry.full.to_ascii_lowercase(),
+                full_to_lower(entry.full.as_bytes()),
                 &format!("&tzdata::{}", entry.canon),
             );
         }
@@ -262,7 +268,7 @@ use tz::TimeZoneRef;
     writeln!(
         f,
         "\
-pub(crate) const TIME_ZONES_BY_NAME: phf::Map<&'static str, &'static TimeZoneRef<'static>> = {};",
+pub(crate) const TIME_ZONES_BY_NAME: phf::Map<Lower, &'static TimeZoneRef<'static>> = {};",
         phf.build(),
     )?;
     writeln!(f)?;
@@ -272,7 +278,7 @@ pub(crate) const TIME_ZONES_BY_NAME: phf::Map<&'static str, &'static TimeZoneRef
     for entries in entries_by_bytes.values() {
         for entry in entries {
             phf.entry(
-                entry.full.to_ascii_lowercase(),
+                full_to_lower(entry.full.as_bytes()),
                 &format!("raw_tzdata::{}", entry.canon),
             );
         }
@@ -281,7 +287,7 @@ pub(crate) const TIME_ZONES_BY_NAME: phf::Map<&'static str, &'static TimeZoneRef
     writeln!(
         f,
         "\
-pub(crate) const RAW_TIME_ZONES_BY_NAME: phf::Map<&'static str, &'static [u8]> = {};",
+pub(crate) const RAW_TIME_ZONES_BY_NAME: phf::Map<Lower, &'static [u8]> = {};",
         phf.build(),
     )?;
     writeln!(f)?;

make-tzdb/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "tzdb"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 authors = ["René Kijewski <crates.io@k6i.de>"]
 repository = "https://github.com/Kijewski/tzdb"
@@ -15,20 +15,21 @@ rust-version = "1.57"
 tz-rs = { version = "0.6.9", features = ["const"] }
 
 # optional dependencies
-byte-slice-cast = { version = "1.2.1", optional = true }
-iana-time-zone = { version = "0.1.33", optional = true }
-phf = { version = "0.10.1", optional = true }
-serde = { version = "1.0.136", default-features = false, optional = true }
-serde_with = { version = "1.12.1", default-features = false, optional = true }
+byte-slice-cast = { version = "=1", optional = true }
+iana-time-zone = { version = "=0.1", optional = true }
+phf = { version = "=0.10", optional = true }
+phf_shared = { version = "=0.10", optional = true }
+serde = { version = "=1", default-features = false, optional = true }
+serde_with = { version = "=1", default-features = false, optional = true }
 
 [dev-dependencies]
-serde_json = "1.0.79"
+serde_json = "=1"
 
 [features]
 default = ["by-name", "list", "local"]
 ## enables [tz_by_name()] to get a time zone at runtime by name
 ##
-by-name = ["phf", "byte-slice-cast"]
+by-name = ["phf", "phf_shared", "byte-slice-cast"]
 ## enables [TZ_NAMES] to get a list of all shipped time zones
 ##
 list = []