diff --git a/.zed/settings.json b/.zed/settings.json index 13485f6..14b551a 100644 --- a/.zed/settings.json +++ b/.zed/settings.json @@ -1,18 +1,10 @@ { - "project_name": null, - - "auto_install_extensions": { - "tombi": true, - "cargo-appraiser": true - }, - "languages": { "TOML": { "format_on_save": "on", - "formatter": { "language_server": { "name": "tombi" } } - } + "formatter": { "language_server": { "name": "tombi" } }, + }, }, - "lsp": { "rust-analyzer": { "initialization_options": { @@ -20,9 +12,14 @@ "granularity": { "enforce": true, "group": "module" }, "group": { "enable": true }, "merge": { "glob": false }, - "preferNoStd": true - } - } - } - } + "preferNoStd": true, + }, + "server": { + "extraEnv": { + "RUSTUP_TOOLCHAIN": "stable", + }, + }, + }, + }, + }, } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f4b83c..ee6138d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,4 +3,5 @@ How to Contribute We'd love to accept your patches and contributions to this project. We just need you to follow the Contributor License Agreement outlined -in the latest v0.0.x of https://github.com/Skrunix/license +in the latest v0.0.x of https://git.skrundz.dev/skrunix/license +(mirrored to https://github.com/skrunix/license) diff --git a/Cargo.toml b/Cargo.toml index 3da4cc0..69e5e12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["architect", "sample"] +members = ["crates/*"] [workspace.package] license-file = "LICENSE.md" @@ -9,8 +9,8 @@ edition = "2024" rust-version = "1.85.0" [workspace.dependencies] -architect = { path = "architect", version = "=0.0.0", default-features = false } -sample = { path = "sample", version = "=0.0.0", default-features = false } +architect = { path = "crates/architect", version = "=0.0.0", default-features = false } +sample = { path = "crates/sample", version = "=0.0.0", default-features = false } paste = { version = "^1", default-features = false } diff --git a/architect/Cargo.toml b/crates/architect/Cargo.toml similarity index 100% rename from architect/Cargo.toml rename to crates/architect/Cargo.toml diff --git a/architect/README.md b/crates/architect/README.md similarity index 100% rename from architect/README.md rename to crates/architect/README.md diff --git a/architect/src/input/mod.rs b/crates/architect/src/input/mod.rs similarity index 100% rename from architect/src/input/mod.rs rename to crates/architect/src/input/mod.rs diff --git a/architect/src/input/raw.rs b/crates/architect/src/input/raw.rs similarity index 100% rename from architect/src/input/raw.rs rename to crates/architect/src/input/raw.rs diff --git a/architect/src/lib.rs b/crates/architect/src/lib.rs similarity index 100% rename from architect/src/lib.rs rename to crates/architect/src/lib.rs diff --git a/architect/src/output/mod.rs b/crates/architect/src/output/mod.rs similarity index 100% rename from architect/src/output/mod.rs rename to crates/architect/src/output/mod.rs diff --git a/architect/src/output/raw.rs b/crates/architect/src/output/raw.rs similarity index 100% rename from architect/src/output/raw.rs rename to crates/architect/src/output/raw.rs diff --git a/sample/Cargo.toml b/crates/sample/Cargo.toml similarity index 100% rename from sample/Cargo.toml rename to crates/sample/Cargo.toml diff --git a/sample/build.rs b/crates/sample/build.rs similarity index 100% rename from sample/build.rs rename to crates/sample/build.rs diff --git a/sample/src/lib.rs b/crates/sample/src/lib.rs similarity index 100% rename from sample/src/lib.rs rename to crates/sample/src/lib.rs diff --git a/tombi.toml b/tombi.toml index 6ee615f..34aa2df 100644 --- a/tombi.toml +++ b/tombi.toml @@ -3,3 +3,9 @@ toml-version = "v1.0.0" [format.rules] indent-style = "tab" indent-width = 4 + +# Required for rust <1.94 +[[schemas]] +toml-version = "v1.0.0" +path = "tombi://www.schemastore.org/cargo.json" +include = ["Cargo.toml"]