From 8014ec40760741bf713ace57af89b9cf2067db28 Mon Sep 17 00:00:00 2001 From: soup Date: Mon, 14 Oct 2024 22:19:45 -0400 Subject: [PATCH] Move uhttp to its own repo --- .gitignore | 1 - Cargo.lock | 25 ------------------- Cargo.toml | 14 +++-------- crates/uhttp/README.md => README.md | 0 .../{uhttp/crates => }/uhttp-ext/Cargo.toml | 0 .../{uhttp/crates => }/uhttp-ext/src/lib.rs | 0 crates/uhttp/Cargo.toml | 9 ------- {crates/uhttp/examples => examples}/client.rs | 0 {crates/uhttp/examples => examples}/echo.rs | 0 flake.lock | 18 ++++++------- {crates/uhttp/src => src}/common.rs | 0 {crates/uhttp/src => src}/lib.rs | 0 src/main.rs | 3 --- {crates/uhttp/src => src}/parse.rs | 0 {crates/uhttp/src => src}/parts.rs | 0 {crates/uhttp/src => src}/util.rs | 0 {crates/uhttp/src => src}/write.rs | 0 17 files changed, 13 insertions(+), 57 deletions(-) delete mode 100644 .gitignore delete mode 100644 Cargo.lock rename crates/uhttp/README.md => README.md (100%) rename crates/{uhttp/crates => }/uhttp-ext/Cargo.toml (100%) rename crates/{uhttp/crates => }/uhttp-ext/src/lib.rs (100%) delete mode 100644 crates/uhttp/Cargo.toml rename {crates/uhttp/examples => examples}/client.rs (100%) rename {crates/uhttp/examples => examples}/echo.rs (100%) rename {crates/uhttp/src => src}/common.rs (100%) rename {crates/uhttp/src => src}/lib.rs (100%) delete mode 100644 src/main.rs rename {crates/uhttp/src => src}/parse.rs (100%) rename {crates/uhttp/src => src}/parts.rs (100%) rename {crates/uhttp/src => src}/util.rs (100%) rename {crates/uhttp/src => src}/write.rs (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ea8c4bf..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index 614cf90..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,25 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "shelves" -version = "0.1.0" -dependencies = [ - "uhttp", - "uhttp-ext", -] - -[[package]] -name = "uhttp" -version = "0.1.0" -dependencies = [ - "uhttp-ext", -] - -[[package]] -name = "uhttp-ext" -version = "0.1.0" -dependencies = [ - "uhttp", -] diff --git a/Cargo.toml b/Cargo.toml index 4b42423..4a4bb87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,9 @@ -[workspace] -members = [ - "crates/uhttp", - "crates/uhttp/crates/uhttp-ext", -] -resolver = "2" - [package] -name = "shelves" +name = "uhttp" version = "0.1.0" edition = "2021" [dependencies] -uhttp = { path = "crates/uhttp" } -uhttp-ext = { path = "crates/uhttp/crates/uhttp-ext" } + +[dev-dependencies] +uhttp-ext = { path = "./crates/uhttp-ext" } \ No newline at end of file diff --git a/crates/uhttp/README.md b/README.md similarity index 100% rename from crates/uhttp/README.md rename to README.md diff --git a/crates/uhttp/crates/uhttp-ext/Cargo.toml b/crates/uhttp-ext/Cargo.toml similarity index 100% rename from crates/uhttp/crates/uhttp-ext/Cargo.toml rename to crates/uhttp-ext/Cargo.toml diff --git a/crates/uhttp/crates/uhttp-ext/src/lib.rs b/crates/uhttp-ext/src/lib.rs similarity index 100% rename from crates/uhttp/crates/uhttp-ext/src/lib.rs rename to crates/uhttp-ext/src/lib.rs diff --git a/crates/uhttp/Cargo.toml b/crates/uhttp/Cargo.toml deleted file mode 100644 index 4a4bb87..0000000 --- a/crates/uhttp/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "uhttp" -version = "0.1.0" -edition = "2021" - -[dependencies] - -[dev-dependencies] -uhttp-ext = { path = "./crates/uhttp-ext" } \ No newline at end of file diff --git a/crates/uhttp/examples/client.rs b/examples/client.rs similarity index 100% rename from crates/uhttp/examples/client.rs rename to examples/client.rs diff --git a/crates/uhttp/examples/echo.rs b/examples/echo.rs similarity index 100% rename from crates/uhttp/examples/echo.rs rename to examples/echo.rs diff --git a/flake.lock b/flake.lock index bd6e71e..cb0df28 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1728344376, - "narHash": "sha256-lxTce2XE6mfJH8Zk6yBbqsbu9/jpwdymbSH5cCbiVOA=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "fd86b78f5f35f712c72147427b1eb81a9bd55d0b", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1728455642, - "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", + "lastModified": 1728887700, + "narHash": "sha256-i+WCARuldFmXlNW6XlEYiL8UGMzjdg5lMQ9gpACQL/A=", "owner": "nix-community", "repo": "fenix", - "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", + "rev": "bcf74e45d5a818fe3aadf5cb3099189770e18579", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1728386838, - "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", + "lastModified": 1728719115, + "narHash": "sha256-SLcHmKzkIuahBbSCWr2gzu6bXo6wF12JP4myDzH1CvQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", + "rev": "d7628c0a8b95cadefe89d9a45f9be5ee4898c6b1", "type": "github" }, "original": { diff --git a/crates/uhttp/src/common.rs b/src/common.rs similarity index 100% rename from crates/uhttp/src/common.rs rename to src/common.rs diff --git a/crates/uhttp/src/lib.rs b/src/lib.rs similarity index 100% rename from crates/uhttp/src/lib.rs rename to src/lib.rs diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 09486cd..0000000 --- a/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("hello, world"); -} diff --git a/crates/uhttp/src/parse.rs b/src/parse.rs similarity index 100% rename from crates/uhttp/src/parse.rs rename to src/parse.rs diff --git a/crates/uhttp/src/parts.rs b/src/parts.rs similarity index 100% rename from crates/uhttp/src/parts.rs rename to src/parts.rs diff --git a/crates/uhttp/src/util.rs b/src/util.rs similarity index 100% rename from crates/uhttp/src/util.rs rename to src/util.rs diff --git a/crates/uhttp/src/write.rs b/src/write.rs similarity index 100% rename from crates/uhttp/src/write.rs rename to src/write.rs