Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Organize Space crate

Anand Baburajan444291e72e31
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
index 007abd37d8..1c5368848b 100644
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -7,7 +7,7 @@ on:
- "web/**"
- "rust/bindings/wasm/ente-wasm/**"
- "rust/bindings/wasm/space/**"
- - "rust/space/**"
+ - "rust/crates/space/**"
- "rust/crates/contacts/**"
- "rust/crates/core/**"
- "rust/Cargo.lock"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 24f8d1bbc2..5d8e749b0f 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -20,8 +20,8 @@ members = [
"crates/image",
"crates/paste",
"crates/photos",
+ "crates/space",
"crates/test-support",
- "space",
]
[workspace.dependencies]
@@ -33,7 +33,7 @@ ente-ensu = { path = "crates/ensu" }
ente-image = { path = "crates/image" }
ente-paste = { path = "crates/paste" }
ente-photos = { path = "crates/photos" }
-ente-space = { path = "space" }
+ente-space = { path = "crates/space" }
ente-test-support = { path = "crates/test-support" }
flutter_rust_bridge = "=2.12.0"
flutter_rust_bridge_codegen = "=2.12.0"
diff --git a/rust/space/Cargo.toml b/rust/crates/space/Cargo.toml
similarity index 100%
rename from rust/space/Cargo.toml
rename to rust/crates/space/Cargo.toml
diff --git a/rust/space/src/client/assets.rs b/rust/crates/space/src/client/assets.rs
similarity index 100%
rename from rust/space/src/client/assets.rs
rename to rust/crates/space/src/client/assets.rs
diff --git a/rust/space/src/client/entity_keys.rs b/rust/crates/space/src/client/entity_keys.rs
similarity index 100%
rename from rust/space/src/client/entity_keys.rs
rename to rust/crates/space/src/client/entity_keys.rs
diff --git a/rust/space/src/client/friends.rs b/rust/crates/space/src/client/friends.rs
similarity index 100%
rename from rust/space/src/client/friends.rs
rename to rust/crates/space/src/client/friends.rs
diff --git a/rust/space/src/client/keys.rs b/rust/crates/space/src/client/keys.rs
similarity index 100%
rename from rust/space/src/client/keys.rs
rename to rust/crates/space/src/client/keys.rs
diff --git a/rust/space/src/client/links.rs b/rust/crates/space/src/client/links.rs
similarity index 100%
rename from rust/space/src/client/links.rs
rename to rust/crates/space/src/client/links.rs
diff --git a/rust/space/src/client/media.rs b/rust/crates/space/src/client/media.rs
similarity index 100%
rename from rust/space/src/client/media.rs
rename to rust/crates/space/src/client/media.rs
diff --git a/rust/space/src/client/messages.rs b/rust/crates/space/src/client/messages.rs
similarity index 100%
rename from rust/space/src/client/messages.rs
rename to rust/crates/space/src/client/messages.rs
diff --git a/rust/space/src/client/mod.rs b/rust/crates/space/src/client/mod.rs
similarity index 100%
rename from rust/space/src/client/mod.rs
rename to rust/crates/space/src/client/mod.rs
diff --git a/rust/space/src/client/posts.rs b/rust/crates/space/src/client/posts.rs
similarity index 100%
rename from rust/space/src/client/posts.rs
rename to rust/crates/space/src/client/posts.rs
diff --git a/rust/space/src/client/profiles.rs b/rust/crates/space/src/client/profiles.rs
similarity index 100%
rename from rust/space/src/client/profiles.rs
rename to rust/crates/space/src/client/profiles.rs
diff --git a/rust/space/src/client/test_support.rs b/rust/crates/space/src/client/test_support.rs
similarity index 100%
rename from rust/space/src/client/test_support.rs
rename to rust/crates/space/src/client/test_support.rs
diff --git a/rust/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rs
similarity index 100%
rename from rust/space/src/client/tests.rs
rename to rust/crates/space/src/client/tests.rs
diff --git a/rust/space/src/crypto.rs b/rust/crates/space/src/crypto.rs
similarity index 100%
rename from rust/space/src/crypto.rs
rename to rust/crates/space/src/crypto.rs
diff --git a/rust/space/src/error.rs b/rust/crates/space/src/error.rs
similarity index 100%
rename from rust/space/src/error.rs
rename to rust/crates/space/src/error.rs
diff --git a/rust/space/src/lib.rs b/rust/crates/space/src/lib.rs
similarity index 100%
rename from rust/space/src/lib.rs
rename to rust/crates/space/src/lib.rs
diff --git a/rust/space/src/models.rs b/rust/crates/space/src/models.rs
similarity index 100%
rename from rust/space/src/models.rs
rename to rust/crates/space/src/models.rs
diff --git a/rust/space/src/transport.rs b/rust/crates/space/src/transport.rs
similarity index 100%
rename from rust/space/src/transport.rs
rename to rust/crates/space/src/transport.rs
diff --git a/rust/space/tests/space.rs b/rust/crates/space/tests/space.rs
similarity index 100%
rename from rust/space/tests/space.rs
rename to rust/crates/space/tests/space.rs
diff --git a/rust/space/tests/support/auth.rs b/rust/crates/space/tests/support/auth.rs
similarity index 100%
rename from rust/space/tests/support/auth.rs
rename to rust/crates/space/tests/support/auth.rs
diff --git a/rust/space/tests/support/mod.rs b/rust/crates/space/tests/support/mod.rs
similarity index 100%
rename from rust/space/tests/support/mod.rs
rename to rust/crates/space/tests/support/mod.rs
diff --git a/rust/space/tests/support/space.rs b/rust/crates/space/tests/support/space.rs
similarity index 100%
rename from rust/space/tests/support/space.rs
rename to rust/crates/space/tests/support/space.rs
diff --git a/server/space/README.md b/server/space/README.md
index 3ee0858997..5d5030c9ee 100644
--- a/server/space/README.md
+++ b/server/space/README.md
@@ -10,7 +10,7 @@ This module is the top-level home for space functionality in `server`.
- `space/models`: space request/response and module-local types
The Rust space client lives alongside the rest of the Ente Rust crates at
-`../rust/space`, not inside `server/space`.
+`rust/crates/space`, not inside `server/space`.
The space root key bootstrap remains on the existing `/user-entity/key` endpoint via `userentity.Space`.