diff --git a/Cargo.lock b/Cargo.lock index 99e7f3d..bc053c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -949,7 +949,7 @@ dependencies = [ "syn", "thiserror", "typify", - "unicode-xid", + "unicode-ident", ] [[package]] diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml index 5b62022..4dbd0bc 100644 --- a/progenitor-impl/Cargo.toml +++ b/progenitor-impl/Cargo.toml @@ -21,7 +21,7 @@ serde_json = "1.0" syn = { version = "1.0", features = ["parsing"] } thiserror = "1.0" typify = "0.0.8" -unicode-xid = "0.2" +unicode-ident = "1.0.0" [dev-dependencies] dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false } diff --git a/progenitor-impl/src/util.rs b/progenitor-impl/src/util.rs index f4fe189..6227c6c 100644 --- a/progenitor-impl/src/util.rs +++ b/progenitor-impl/src/util.rs @@ -4,7 +4,7 @@ use indexmap::IndexMap; use openapiv3::{ Components, Parameter, ReferenceOr, RequestBody, Response, Schema, }; -use unicode_xid::UnicodeXID; +use unicode_ident::{is_xid_continue, is_xid_start}; use crate::Result; @@ -82,13 +82,13 @@ pub(crate) fn sanitize(input: &str, case: Case) -> String { _ => to_case( &input .replace("'", "") - .replace(|c: char| !c.is_xid_continue(), "-"), + .replace(|c: char| !is_xid_continue(c), "-"), ), }; let out = match out.chars().next() { None => to_case("x"), - Some(c) if c.is_xid_start() => out, + Some(c) if is_xid_start(c) => out, Some(_) => format!("_{}", out), };