Fix automata paths.

crates/core/Cargo.toml

@@ -20,7 +20,7 @@ data = ["dep:base64"]
 pct-str = "2.0"
 smallvec = "1.2"
 thiserror = "1.0.40"
-static-regular-grammar = "2.0"
+static-regular-grammar = "2.0.2"
 serde = { version = "1.0", optional = true }
 hashbrown = { version = "0.14.0", optional = true }
 base64 = { version = "0.22.1", optional = true }

crates/core/src/iri/authority.rs

@@ -16,10 +16,10 @@ pub use userinfo::*;
 
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "iauthority",
 	name = "IRI authority",
-	cache = "crates/core/automata/iri/authority.aut.cbor"
+	cache = "automata/iri/authority.aut.cbor"
 )]
 #[grammar(sized(
 	AuthorityBuf,

crates/core/src/iri/authority/host.rs

@@ -12,11 +12,11 @@ use crate::common::authority::HostImpl;
 /// IRI authority host.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "ihost",
 	name = "IRI host",
 	no_deref,
-	cache = "crates/core/automata/iri/host.aut.cbor"
+	cache = "automata/iri/host.aut.cbor"
 )]
 #[grammar(sized(HostBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/iri/authority/userinfo.rs

@@ -11,11 +11,11 @@ use crate::common::authority::UserInofImpl;
 
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "iuserinfo",
 	name = "IRI user info",
 	no_deref,
-	cache = "crates/core/automata/iri/userinfo.aut.cbor"
+	cache = "automata/iri/userinfo.aut.cbor"
 )]
 #[grammar(sized(
 	UserInfoBuf,

crates/core/src/iri/fragment.rs

@@ -12,11 +12,11 @@ use crate::common::FragmentImpl;
 /// IRI fragment.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "ifragment",
 	name = "IRI fragment",
 	no_deref,
-	cache = "crates/core/automata/iri/fragment.aut.cbor"
+	cache = "automata/iri/fragment.aut.cbor"
 )]
 #[grammar(sized(
 	FragmentBuf,

crates/core/src/iri/mod.rs

@@ -121,9 +121,9 @@ iri_error! {
 /// ```
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "IRI",
-	cache = "crates/core/automata/iri.aut.cbor"
+	cache = "automata/iri.aut.cbor"
 )]
 #[grammar(sized(IriBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/iri/path.rs

@@ -11,10 +11,10 @@ use super::PathMut;
 /// IRI path.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "ipath",
 	name = "IRI path",
-	cache = "crates/core/automata/iri/path.aut.cbor"
+	cache = "automata/iri/path.aut.cbor"
 )]
 #[grammar(sized(PathBuf, derive(Debug, Display)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/iri/path/segment.rs

@@ -12,11 +12,11 @@ use crate::common::path::SegmentImpl;
 /// IRI path segment.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "isegment",
 	name = "IRI path segment",
 	no_deref,
-	cache = "crates/core/automata/iri/segment.aut.cbor"
+	cache = "automata/iri/segment.aut.cbor"
 )]
 #[grammar(sized(
 	SegmentBuf,

crates/core/src/iri/query.rs

@@ -12,11 +12,11 @@ use crate::common::QueryImpl;
 /// IRI query.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "iquery",
 	name = "IRI query",
 	no_deref,
-	cache = "crates/core/automata/iri/query.aut.cbor"
+	cache = "automata/iri/query.aut.cbor"
 )]
 #[grammar(sized(QueryBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/iri/reference.rs

@@ -13,10 +13,10 @@ use super::{Authority, AuthorityMut, Fragment, Path, PathBuf, PathMut, Query, Sc
 /// IRI reference.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/iri/grammar.abnf",
+	file = "src/iri/grammar.abnf",
 	entry_point = "IRI-reference",
 	name = "IRI reference",
-	cache = "crates/core/automata/iri/reference.aut.cbor"
+	cache = "automata/iri/reference.aut.cbor"
 )]
 #[grammar(sized(
 	IriRefBuf,

crates/core/src/uri/authority.rs

@@ -17,11 +17,11 @@ pub use userinfo::*;
 
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "authority",
 	name = "URI authority",
 	ascii,
-	cache = "crates/core/automata/uri/authority.aut.cbor"
+	cache = "automata/uri/authority.aut.cbor"
 )]
 #[grammar(sized(
 	AuthorityBuf,

crates/core/src/uri/authority/host.rs

@@ -12,12 +12,12 @@ use crate::common::HostImpl;
 /// IRI authority host.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "host",
 	name = "URI host",
 	ascii,
 	no_deref,
-	cache = "crates/core/automata/uri/host.aut.cbor"
+	cache = "automata/uri/host.aut.cbor"
 )]
 #[grammar(sized(HostBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/uri/authority/port.rs

@@ -2,11 +2,11 @@ use static_regular_grammar::RegularGrammar;
 
 #[derive(RegularGrammar, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "port",
 	name = "URI port",
 	ascii,
-	cache = "crates/core/automata/uri/port.aut.cbor"
+	cache = "automata/uri/port.aut.cbor"
 )]
 #[grammar(sized(PortBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/uri/authority/userinfo.rs

@@ -11,12 +11,12 @@ use crate::common::UserInofImpl;
 
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "userinfo",
 	name = "URI user info",
 	ascii,
 	no_deref,
-	cache = "crates/core/automata/uri/userinfo.aut.cbor"
+	cache = "automata/uri/userinfo.aut.cbor"
 )]
 #[grammar(sized(
 	UserInfoBuf,

crates/core/src/uri/fragment.rs

@@ -12,12 +12,12 @@ use crate::common::FragmentImpl;
 /// URI fragment.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "fragment",
 	name = "URI fragment",
 	ascii,
 	no_deref,
-	cache = "crates/core/automata/uri/fragment.aut.cbor"
+	cache = "automata/uri/fragment.aut.cbor"
 )]
 #[grammar(sized(
 	FragmentBuf,

crates/core/src/uri/mod.rs

@@ -103,10 +103,10 @@ uri_error! {
 /// Uniform Resource Identifier (URI).
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "URI",
 	ascii,
-	cache = "crates/core/automata/uri.aut.cbor"
+	cache = "automata/uri.aut.cbor"
 )]
 #[grammar(sized(UriBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/uri/path.rs

@@ -11,11 +11,11 @@ use super::PathMut;
 /// IRI path.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "path",
 	name = "URI path",
 	ascii,
-	cache = "crates/core/automata/uri/path.aut.cbor"
+	cache = "automata/uri/path.aut.cbor"
 )]
 #[grammar(sized(PathBuf, derive(Debug, Display)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/uri/path/segment.rs

@@ -12,12 +12,12 @@ use crate::common::path::SegmentImpl;
 /// IRI path segment.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "segment",
 	name = "URI path segment",
 	ascii,
 	no_deref,
-	cache = "crates/core/automata/uri/segment.aut.cbor"
+	cache = "automata/uri/segment.aut.cbor"
 )]
 #[grammar(sized(
 	SegmentBuf,

crates/core/src/uri/query.rs

@@ -11,12 +11,12 @@ use crate::common::QueryImpl;
 
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "query",
 	name = "URI query",
 	ascii,
 	no_deref,
-	cache = "crates/core/automata/uri/query.aut.cbor"
+	cache = "automata/uri/query.aut.cbor"
 )]
 #[grammar(sized(QueryBuf, derive(Debug, Display, PartialEq, Eq, PartialOrd, Ord, Hash)))]
 #[cfg_attr(feature = "serde", grammar(serde))]

crates/core/src/uri/reference.rs

@@ -12,10 +12,10 @@ use super::{bytestr_eq, Authority, AuthorityMut, Fragment, Path, PathBuf, PathMu
 /// URI reference.
 #[derive(RegularGrammar)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "URI-reference",
 	name = "URI reference",
-	cache = "crates/core/automata/uri/reference.aut.cbor",
+	cache = "automata/uri/reference.aut.cbor",
 	ascii
 )]
 #[grammar(sized(

crates/core/src/uri/scheme/mod.rs

@@ -5,11 +5,11 @@ pub mod data;
 
 #[derive(RegularGrammar, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[grammar(
-	file = "crates/core/src/uri/grammar.abnf",
+	file = "src/uri/grammar.abnf",
 	entry_point = "scheme",
 	name = "Scheme",
 	ascii,
-	cache = "crates/core/automata/uri/scheme.aut.cbor"
+	cache = "automata/uri/scheme.aut.cbor"
 )]
 #[grammar(sized(
 	SchemeBuf,