From 1abc0a626ff7655fe60b8fccfe3f9bdc3ee19dde Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Fri, 13 Sep 2024 16:37:59 +0200 Subject: [PATCH] Back to underscores we go because too late, we published them --- .zed/settings.json | 2 +- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- Justfile | 2 +- merde/Cargo.toml | 12 ++++++------ merde/README.md | 2 +- {merde-core => merde_core}/CHANGELOG.md | 0 {merde-core => merde_core}/Cargo.toml | 2 +- {merde-core => merde_core}/README.md | 0 {merde-core => merde_core}/src/array.rs | 0 {merde-core => merde_core}/src/cowstr.rs | 0 {merde-core => merde_core}/src/deserialize.rs | 0 {merde-core => merde_core}/src/error.rs | 0 {merde-core => merde_core}/src/into_static.rs | 0 {merde-core => merde_core}/src/lib.rs | 0 {merde-core => merde_core}/src/map.rs | 0 {merde-core => merde_core}/src/value.rs | 0 {merde-json => merde_json}/CHANGELOG.md | 0 {merde-json => merde_json}/Cargo.toml | 4 ++-- {merde-json => merde_json}/README.md | 0 {merde-json => merde_json}/src/error.rs | 0 .../src/jiter_lite/errors.rs | 0 .../src/jiter_lite/jiter.rs | 0 .../src/jiter_lite/mod.rs | 0 .../src/jiter_lite/number_decoder.rs | 0 .../src/jiter_lite/parse.rs | 0 .../src/jiter_lite/simd_aarch64.rs | 0 .../src/jiter_lite/string_decoder.rs | 0 {merde-json => merde_json}/src/lib.rs | 0 {merde-json => merde_json}/src/parser.rs | 0 {merde-time => merde_time}/CHANGELOG.md | 0 {merde-time => merde_time}/Cargo.toml | 10 +++++----- {merde-time => merde_time}/README.md | 0 {merde-time => merde_time}/src/lib.rs | 0 zerodeps-example/Cargo.lock | 2 +- zerodeps-example/Cargo.toml | 4 ++-- 36 files changed, 30 insertions(+), 30 deletions(-) rename {merde-core => merde_core}/CHANGELOG.md (100%) rename {merde-core => merde_core}/Cargo.toml (96%) rename {merde-core => merde_core}/README.md (100%) rename {merde-core => merde_core}/src/array.rs (100%) rename {merde-core => merde_core}/src/cowstr.rs (100%) rename {merde-core => merde_core}/src/deserialize.rs (100%) rename {merde-core => merde_core}/src/error.rs (100%) rename {merde-core => merde_core}/src/into_static.rs (100%) rename {merde-core => merde_core}/src/lib.rs (100%) rename {merde-core => merde_core}/src/map.rs (100%) rename {merde-core => merde_core}/src/value.rs (100%) rename {merde-json => merde_json}/CHANGELOG.md (100%) rename {merde-json => merde_json}/Cargo.toml (89%) rename {merde-json => merde_json}/README.md (100%) rename {merde-json => merde_json}/src/error.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/errors.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/jiter.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/mod.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/number_decoder.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/parse.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/simd_aarch64.rs (100%) rename {merde-json => merde_json}/src/jiter_lite/string_decoder.rs (100%) rename {merde-json => merde_json}/src/lib.rs (100%) rename {merde-json => merde_json}/src/parser.rs (100%) rename {merde-time => merde_time}/CHANGELOG.md (100%) rename {merde-time => merde_time}/Cargo.toml (74%) rename {merde-time => merde_time}/README.md (100%) rename {merde-time => merde_time}/src/lib.rs (100%) diff --git a/.zed/settings.json b/.zed/settings.json index 3f08782..1046c99 100644 --- a/.zed/settings.json +++ b/.zed/settings.json @@ -10,7 +10,7 @@ "command": "clippy" }, "cargo": { - "features": ["merde/full", "merde-time/full", "merde-json/full"] + "features": ["merde/full", "merde_time/full", "merde_json/full"] } } } diff --git a/Cargo.lock b/Cargo.lock index f892392..e77f0c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,34 +86,34 @@ dependencies = [ name = "merde" version = "4.0.0" dependencies = [ - "merde-core", - "merde-json", - "merde-time", + "merde_core", + "merde_json", + "merde_time", ] [[package]] -name = "merde-core" +name = "merde_core" version = "4.0.0" dependencies = [ "compact_str", ] [[package]] -name = "merde-json" +name = "merde_json" version = "4.0.0" dependencies = [ "lexical-parse-float", - "merde-core", + "merde_core", "num-bigint", "num-traits", ] [[package]] -name = "merde-time" +name = "merde_time" version = "4.0.0" dependencies = [ - "merde-core", - "merde-json", + "merde_core", + "merde_json", "time", ] diff --git a/Cargo.toml b/Cargo.toml index 6a6b4a1..1a6a71c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,4 @@ [workspace] resolver = "2" -members = ["merde", "merde-json", "merde-time", "merde-core"] +members = ["merde", "merde_json", "merde_time", "merde_core"] exclude = ["zerodeps-example"] diff --git a/Justfile b/Justfile index 7b84e73..a5cdd8c 100644 --- a/Justfile +++ b/Justfile @@ -9,5 +9,5 @@ check: cargo check cargo check --features=merde cargo tree --prefix none --no-dedupe | grep -v merde-core - cargo tree --prefix none --no-dedupe --features=merde | grep merde-core + cargo tree --prefix none --no-dedupe --features=merde | grep merde_core popd diff --git a/merde/Cargo.toml b/merde/Cargo.toml index da8dc43..60d3777 100644 --- a/merde/Cargo.toml +++ b/merde/Cargo.toml @@ -26,14 +26,14 @@ path = "examples/into-static.rs" required-features = ["json"] [dependencies] -merde-core = { version = "4.0.0", path = "../merde-core", optional = true } -merde-json = { version = "4.0.0", path = "../merde-json", optional = true } -merde-time = { version = "4.0.0", path = "../merde-time", optional = true } +merde_core = { version = "4.0.0", path = "../merde_core", optional = true } +merde_json = { version = "4.0.0", path = "../merde_json", optional = true } +merde_time = { version = "4.0.0", path = "../merde_time", optional = true } [features] default = ["core", "deserialize"] full = ["core", "deserialize", "json", "time"] deserialize = ["core"] -core = ["dep:merde-core"] -json = ["dep:merde-json"] -time = ["dep:merde-time"] +core = ["dep:merde_core"] +json = ["dep:merde_json"] +time = ["dep:merde_time"] diff --git a/merde/README.md b/merde/README.md index d6c8c43..a5ad751 100644 --- a/merde/README.md +++ b/merde/README.md @@ -409,7 +409,7 @@ Your manifest could look like this: merde = { version = "4.0.0", default-features = false, features = ["core"] } ``` -And then you'd be able to use merde-provided types, like `CowStr`: +And then you'd be able to use merde_provided types, like `CowStr`: ```rust use merde::CowStr; diff --git a/merde-core/CHANGELOG.md b/merde_core/CHANGELOG.md similarity index 100% rename from merde-core/CHANGELOG.md rename to merde_core/CHANGELOG.md diff --git a/merde-core/Cargo.toml b/merde_core/Cargo.toml similarity index 96% rename from merde-core/Cargo.toml rename to merde_core/Cargo.toml index 79a13db..013a84a 100644 --- a/merde-core/Cargo.toml +++ b/merde_core/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2021" -name = "merde-core" +name = "merde_core" version = "4.0.0" authors = ["Amos Wenger "] description = "Base types for merde" diff --git a/merde-core/README.md b/merde_core/README.md similarity index 100% rename from merde-core/README.md rename to merde_core/README.md diff --git a/merde-core/src/array.rs b/merde_core/src/array.rs similarity index 100% rename from merde-core/src/array.rs rename to merde_core/src/array.rs diff --git a/merde-core/src/cowstr.rs b/merde_core/src/cowstr.rs similarity index 100% rename from merde-core/src/cowstr.rs rename to merde_core/src/cowstr.rs diff --git a/merde-core/src/deserialize.rs b/merde_core/src/deserialize.rs similarity index 100% rename from merde-core/src/deserialize.rs rename to merde_core/src/deserialize.rs diff --git a/merde-core/src/error.rs b/merde_core/src/error.rs similarity index 100% rename from merde-core/src/error.rs rename to merde_core/src/error.rs diff --git a/merde-core/src/into_static.rs b/merde_core/src/into_static.rs similarity index 100% rename from merde-core/src/into_static.rs rename to merde_core/src/into_static.rs diff --git a/merde-core/src/lib.rs b/merde_core/src/lib.rs similarity index 100% rename from merde-core/src/lib.rs rename to merde_core/src/lib.rs diff --git a/merde-core/src/map.rs b/merde_core/src/map.rs similarity index 100% rename from merde-core/src/map.rs rename to merde_core/src/map.rs diff --git a/merde-core/src/value.rs b/merde_core/src/value.rs similarity index 100% rename from merde-core/src/value.rs rename to merde_core/src/value.rs diff --git a/merde-json/CHANGELOG.md b/merde_json/CHANGELOG.md similarity index 100% rename from merde-json/CHANGELOG.md rename to merde_json/CHANGELOG.md diff --git a/merde-json/Cargo.toml b/merde_json/Cargo.toml similarity index 89% rename from merde-json/Cargo.toml rename to merde_json/Cargo.toml index 6cfabcf..fb97560 100644 --- a/merde-json/Cargo.toml +++ b/merde_json/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "merde-json" +name = "merde_json" version = "4.0.0" edition = "2021" authors = ["Amos Wenger "] @@ -12,7 +12,7 @@ categories = ["encoding", "parser-implementations"] [dependencies] lexical-parse-float = { version = "0.8.5", features = ["format"] } -merde-core = { version = "4.0.0", path = "../merde-core" } +merde_core = { version = "4.0.0", path = "../merde_core" } num-bigint = { version = "0.4.6", optional = true } num-traits = { version = "0.2.19", optional = true } diff --git a/merde-json/README.md b/merde_json/README.md similarity index 100% rename from merde-json/README.md rename to merde_json/README.md diff --git a/merde-json/src/error.rs b/merde_json/src/error.rs similarity index 100% rename from merde-json/src/error.rs rename to merde_json/src/error.rs diff --git a/merde-json/src/jiter_lite/errors.rs b/merde_json/src/jiter_lite/errors.rs similarity index 100% rename from merde-json/src/jiter_lite/errors.rs rename to merde_json/src/jiter_lite/errors.rs diff --git a/merde-json/src/jiter_lite/jiter.rs b/merde_json/src/jiter_lite/jiter.rs similarity index 100% rename from merde-json/src/jiter_lite/jiter.rs rename to merde_json/src/jiter_lite/jiter.rs diff --git a/merde-json/src/jiter_lite/mod.rs b/merde_json/src/jiter_lite/mod.rs similarity index 100% rename from merde-json/src/jiter_lite/mod.rs rename to merde_json/src/jiter_lite/mod.rs diff --git a/merde-json/src/jiter_lite/number_decoder.rs b/merde_json/src/jiter_lite/number_decoder.rs similarity index 100% rename from merde-json/src/jiter_lite/number_decoder.rs rename to merde_json/src/jiter_lite/number_decoder.rs diff --git a/merde-json/src/jiter_lite/parse.rs b/merde_json/src/jiter_lite/parse.rs similarity index 100% rename from merde-json/src/jiter_lite/parse.rs rename to merde_json/src/jiter_lite/parse.rs diff --git a/merde-json/src/jiter_lite/simd_aarch64.rs b/merde_json/src/jiter_lite/simd_aarch64.rs similarity index 100% rename from merde-json/src/jiter_lite/simd_aarch64.rs rename to merde_json/src/jiter_lite/simd_aarch64.rs diff --git a/merde-json/src/jiter_lite/string_decoder.rs b/merde_json/src/jiter_lite/string_decoder.rs similarity index 100% rename from merde-json/src/jiter_lite/string_decoder.rs rename to merde_json/src/jiter_lite/string_decoder.rs diff --git a/merde-json/src/lib.rs b/merde_json/src/lib.rs similarity index 100% rename from merde-json/src/lib.rs rename to merde_json/src/lib.rs diff --git a/merde-json/src/parser.rs b/merde_json/src/parser.rs similarity index 100% rename from merde-json/src/parser.rs rename to merde_json/src/parser.rs diff --git a/merde-time/CHANGELOG.md b/merde_time/CHANGELOG.md similarity index 100% rename from merde-time/CHANGELOG.md rename to merde_time/CHANGELOG.md diff --git a/merde-time/Cargo.toml b/merde_time/Cargo.toml similarity index 74% rename from merde-time/Cargo.toml rename to merde_time/Cargo.toml index 0fdb751..cf9a348 100644 --- a/merde-time/Cargo.toml +++ b/merde_time/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2021" -name = "merde-time" +name = "merde_time" version = "4.0.0" authors = ["Amos Wenger "] description = "Wrapper date-time types for merde" @@ -11,8 +11,8 @@ keywords = ["merde", "serialization", "deserialization"] categories = ["encoding", "parser-implementations"] [dependencies] -merde-core = { version = "4.0.0", path = "../merde-core", optional = true } -merde-json = { version = "4.0.0", path = "../merde-json", optional = true } +merde_core = { version = "4.0.0", path = "../merde_core", optional = true } +merde_json = { version = "4.0.0", path = "../merde_json", optional = true } time = "0.3.36" [dev-dependencies] @@ -21,7 +21,7 @@ time = { version = "0.3.36", features = ["macros"] } [features] default = [] full = ["merde", "json", "serialize", "deserialize"] -merde = ["dep:merde-core"] -json = ["merde", "dep:merde-json"] +merde = ["dep:merde_core"] +json = ["merde", "dep:merde_json"] serialize = ["time/formatting"] deserialize = ["time/parsing"] diff --git a/merde-time/README.md b/merde_time/README.md similarity index 100% rename from merde-time/README.md rename to merde_time/README.md diff --git a/merde-time/src/lib.rs b/merde_time/src/lib.rs similarity index 100% rename from merde-time/src/lib.rs rename to merde_time/src/lib.rs diff --git a/zerodeps-example/Cargo.lock b/zerodeps-example/Cargo.lock index 0daa1ea..cea85f4 100644 --- a/zerodeps-example/Cargo.lock +++ b/zerodeps-example/Cargo.lock @@ -74,5 +74,5 @@ name = "zerodeps-example" version = "0.1.0" dependencies = [ "merde", - "merde-core", + "merde_core", ] diff --git a/zerodeps-example/Cargo.toml b/zerodeps-example/Cargo.toml index 6f1218a..f9bed4a 100644 --- a/zerodeps-example/Cargo.toml +++ b/zerodeps-example/Cargo.toml @@ -6,8 +6,8 @@ publish = false [dependencies] merde = { version = "4.0.0", path = "../merde", default-features = false } -merde-core = { version = "4.0.0", path = "../merde-core", default-features = false } +merdelcore = { version = "4.0.0", path = "../merde_core", default-features = false } [features] default = [] -merde = ["merde/core", "merde-core/compact_str"] +merde = ["merde/core", "merde_core/compact_str"]