Back to underscores we go because too late, we published them

bearcove · Sep 13, 2024 · 1abc0a6 · 1abc0a6
1 parent a41abf4
commit 1abc0a6
Show file tree

Hide file tree

Showing 36 changed files with 30 additions and 30 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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 → merde_core/CHANGELOG.md b/merde-core/CHANGELOG.md → merde_core/CHANGELOG.md
diff --git a/merde-core/Cargo.toml → merde_core/Cargo.toml b/merde-core/Cargo.toml → merde_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "merde-core"
+name = "merde_core"
 version = "4.0.0"
 authors = ["Amos Wenger <[email protected]>"]
 description = "Base types for merde"

diff --git a/merde-core/README.md → merde_core/README.md b/merde-core/README.md → merde_core/README.md
diff --git a/merde-core/src/array.rs → merde_core/src/array.rs b/merde-core/src/array.rs → merde_core/src/array.rs
diff --git a/merde-core/src/cowstr.rs → merde_core/src/cowstr.rs b/merde-core/src/cowstr.rs → merde_core/src/cowstr.rs
diff --git a/merde-core/src/deserialize.rs → merde_core/src/deserialize.rs b/merde-core/src/deserialize.rs → merde_core/src/deserialize.rs
diff --git a/merde-core/src/error.rs → merde_core/src/error.rs b/merde-core/src/error.rs → merde_core/src/error.rs
diff --git a/merde-core/src/into_static.rs → merde_core/src/into_static.rs b/merde-core/src/into_static.rs → merde_core/src/into_static.rs
diff --git a/merde-core/src/lib.rs → merde_core/src/lib.rs b/merde-core/src/lib.rs → merde_core/src/lib.rs
diff --git a/merde-core/src/map.rs → merde_core/src/map.rs b/merde-core/src/map.rs → merde_core/src/map.rs
diff --git a/merde-core/src/value.rs → merde_core/src/value.rs b/merde-core/src/value.rs → merde_core/src/value.rs
diff --git a/merde-json/CHANGELOG.md → merde_json/CHANGELOG.md b/merde-json/CHANGELOG.md → merde_json/CHANGELOG.md
diff --git a/merde-json/Cargo.toml → merde_json/Cargo.toml b/merde-json/Cargo.toml → merde_json/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "merde-json"
+name = "merde_json"
 version = "4.0.0"
 edition = "2021"
 authors = ["Amos Wenger <[email protected]>"]
@@ -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 → merde_json/README.md b/merde-json/README.md → merde_json/README.md
diff --git a/merde-json/src/error.rs → merde_json/src/error.rs b/merde-json/src/error.rs → merde_json/src/error.rs
diff --git a/merde-json/src/jiter_lite/errors.rs → merde_json/src/jiter_lite/errors.rs b/merde-json/src/jiter_lite/errors.rs → merde_json/src/jiter_lite/errors.rs
diff --git a/merde-json/src/jiter_lite/jiter.rs → merde_json/src/jiter_lite/jiter.rs b/merde-json/src/jiter_lite/jiter.rs → merde_json/src/jiter_lite/jiter.rs
diff --git a/merde-json/src/jiter_lite/mod.rs → merde_json/src/jiter_lite/mod.rs b/merde-json/src/jiter_lite/mod.rs → merde_json/src/jiter_lite/mod.rs
diff --git a/merde-json/src/jiter_lite/number_decoder.rs → merde_json/src/jiter_lite/number_decoder.rs b/merde-json/src/jiter_lite/number_decoder.rs → merde_json/src/jiter_lite/number_decoder.rs
diff --git a/merde-json/src/jiter_lite/parse.rs → merde_json/src/jiter_lite/parse.rs b/merde-json/src/jiter_lite/parse.rs → merde_json/src/jiter_lite/parse.rs
diff --git a/merde-json/src/jiter_lite/simd_aarch64.rs → merde_json/src/jiter_lite/simd_aarch64.rs b/merde-json/src/jiter_lite/simd_aarch64.rs → merde_json/src/jiter_lite/simd_aarch64.rs
diff --git a/merde-json/src/jiter_lite/string_decoder.rs → merde_json/src/jiter_lite/string_decoder.rs b/merde-json/src/jiter_lite/string_decoder.rs → merde_json/src/jiter_lite/string_decoder.rs
diff --git a/merde-json/src/lib.rs → merde_json/src/lib.rs b/merde-json/src/lib.rs → merde_json/src/lib.rs
diff --git a/merde-json/src/parser.rs → merde_json/src/parser.rs b/merde-json/src/parser.rs → merde_json/src/parser.rs
diff --git a/merde-time/CHANGELOG.md → merde_time/CHANGELOG.md b/merde-time/CHANGELOG.md → merde_time/CHANGELOG.md
diff --git a/merde-time/Cargo.toml → merde_time/Cargo.toml b/merde-time/Cargo.toml → merde_time/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "merde-time"
+name = "merde_time"
 version = "4.0.0"
 authors = ["Amos Wenger <[email protected]>"]
 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 → merde_time/README.md b/merde-time/README.md → merde_time/README.md
diff --git a/merde-time/src/lib.rs → merde_time/src/lib.rs b/merde-time/src/lib.rs → merde_time/src/lib.rs
diff --git a/zerodeps-example/Cargo.lock b/zerodeps-example/Cargo.lock
diff --git 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"]