reorganize repo (#4)

NexusSocial · Sep 30, 2024 · baaaec7 · baaaec7
1 parent b128adb
commit baaaec7
Show file tree

Hide file tree

Showing 31 changed files with 10 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,9 @@
 [workspace]
 resolver = "2"
 members = [
-	"apps/identity_server",
-	"crates/did-simple",
+	"did-simple",
+	"header-parsing",
+	"identity-server",
 ]
 
 # These settings will apply to all members of the workspace that opt in to them
@@ -11,7 +12,7 @@ version = "0.0.0"
 license = "MIT-0 OR Apache-2.0"
 repository = "https://github.com/NexusSocial/identity"
 edition = "2021"
-rust-version = "1.78.0"
+rust-version = "1.81.0"
 
 [workspace.dependencies]
 arc-swap = "1.7.1"
@@ -21,9 +22,9 @@ axum-macros = "0.4.1"
 base64 = "0.21.7"
 clap = { version = "4.4.11", features = ["derive"] }
 color-eyre = "0.6"
-did-simple.path = "crates/did-simple"
+did-simple.path = "did-simple"
 eyre = "0.6"
-header-parsing.path = "crates/header-parsing"
+header-parsing.path = "header-parsing"
 hex-literal = "0.4.1"
 http = "1.1.0"
 http-body-util = "0.1.2"

diff --git a/crates/did-simple/Cargo.toml → did-simple/Cargo.toml b/crates/did-simple/Cargo.toml → did-simple/Cargo.toml
diff --git a/crates/did-simple/README.md → did-simple/README.md b/crates/did-simple/README.md → did-simple/README.md
diff --git a/crates/did-simple/src/crypto/ed25519.rs → did-simple/src/crypto/ed25519.rs b/crates/did-simple/src/crypto/ed25519.rs → did-simple/src/crypto/ed25519.rs
diff --git a/crates/did-simple/src/crypto/mod.rs → did-simple/src/crypto/mod.rs b/crates/did-simple/src/crypto/mod.rs → did-simple/src/crypto/mod.rs
diff --git a/crates/did-simple/src/key_algos.rs → did-simple/src/key_algos.rs b/crates/did-simple/src/key_algos.rs → did-simple/src/key_algos.rs
diff --git a/crates/did-simple/src/lib.rs → did-simple/src/lib.rs b/crates/did-simple/src/lib.rs → did-simple/src/lib.rs
diff --git a/crates/did-simple/src/methods/key.rs → did-simple/src/methods/key.rs b/crates/did-simple/src/methods/key.rs → did-simple/src/methods/key.rs
diff --git a/crates/did-simple/src/methods/mod.rs → did-simple/src/methods/mod.rs b/crates/did-simple/src/methods/mod.rs → did-simple/src/methods/mod.rs
diff --git a/crates/did-simple/src/methods/web.rs → did-simple/src/methods/web.rs b/crates/did-simple/src/methods/web.rs → did-simple/src/methods/web.rs
diff --git a/crates/did-simple/src/url.rs → did-simple/src/url.rs b/crates/did-simple/src/url.rs → did-simple/src/url.rs
diff --git a/crates/did-simple/src/utf8bytes.rs → did-simple/src/utf8bytes.rs b/crates/did-simple/src/utf8bytes.rs → did-simple/src/utf8bytes.rs
diff --git a/crates/did-simple/src/varint.rs → did-simple/src/varint.rs b/crates/did-simple/src/varint.rs → did-simple/src/varint.rs
diff --git a/crates/header-parsing/Cargo.toml → header-parsing/Cargo.toml b/crates/header-parsing/Cargo.toml → header-parsing/Cargo.toml
diff --git a/crates/header-parsing/src/lib.rs → header-parsing/src/lib.rs b/crates/header-parsing/src/lib.rs → header-parsing/src/lib.rs
diff --git a/apps/identity_server/Cargo.toml → identity-server/Cargo.toml b/apps/identity_server/Cargo.toml → identity-server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "identity_server"
+name = "identity-server"
 version.workspace = true
 license.workspace = true
 repository.workspace = true

diff --git a/apps/identity_server/build.rs → identity-server/build.rs b/apps/identity_server/build.rs → identity-server/build.rs
diff --git a/apps/identity_server/fixtures/README.md → identity-server/fixtures/README.md b/apps/identity_server/fixtures/README.md → identity-server/fixtures/README.md
diff --git a/...identity_server/fixtures/sample_users.sql → identity-server/fixtures/sample_users.sql b/...identity_server/fixtures/sample_users.sql → identity-server/fixtures/sample_users.sql
diff --git a/.../migrations/20240812062115_users.down.sql → .../migrations/20240812062115_users.down.sql b/.../migrations/20240812062115_users.down.sql → .../migrations/20240812062115_users.down.sql
diff --git a/...er/migrations/20240812062115_users.up.sql → ...er/migrations/20240812062115_users.up.sql b/...er/migrations/20240812062115_users.up.sql → ...er/migrations/20240812062115_users.up.sql
diff --git a/apps/identity_server/migrations/README.md → identity-server/migrations/README.md b/apps/identity_server/migrations/README.md → identity-server/migrations/README.md
diff --git a/apps/identity_server/src/jwk.rs → identity-server/src/jwk.rs b/apps/identity_server/src/jwk.rs → identity-server/src/jwk.rs
diff --git a/apps/identity_server/src/jwks_provider.rs → identity-server/src/jwks_provider.rs b/apps/identity_server/src/jwks_provider.rs → identity-server/src/jwks_provider.rs
@@ -145,6 +145,7 @@ impl JwksProviderT for HttpProvider {
 
 /// Always provides the same JWKs.
 #[derive(Debug, Clone)]
+#[expect(dead_code)]
 struct StaticProvider(Arc<CachedJwks>);
 
 #[async_trait]

diff --git a/apps/identity_server/src/lib.rs → identity-server/src/lib.rs b/apps/identity_server/src/lib.rs → identity-server/src/lib.rs
diff --git a/apps/identity_server/src/main.rs → identity-server/src/main.rs b/apps/identity_server/src/main.rs → identity-server/src/main.rs
diff --git a/apps/identity_server/src/oauth.rs → identity-server/src/oauth.rs b/apps/identity_server/src/oauth.rs → identity-server/src/oauth.rs
diff --git a/apps/identity_server/src/uuid.rs → identity-server/src/uuid.rs b/apps/identity_server/src/uuid.rs → identity-server/src/uuid.rs
diff --git a/apps/identity_server/src/v1/mod.rs → identity-server/src/v1/mod.rs b/apps/identity_server/src/v1/mod.rs → identity-server/src/v1/mod.rs
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.78.0" # See workspace Cargo.toml
+channel = "1.81.0" # See workspace Cargo.toml
 components = ["rust-src"]
 profile = "default"
 targets = ["x86_64-pc-windows-msvc", "aarch64-linux-android", "x86_64-unknown-linux-gnu"]