From 66ee797cbb9b8b8934068635e46ecb14031cc2dd Mon Sep 17 00:00:00 2001 From: David Skrundz Date: Sat, 18 Apr 2026 18:55:28 -0600 Subject: [PATCH] Switch from vscode to zed and add crates folder --- .vscode/extensions.json | 9 -------- .vscode/settings.json | 33 ------------------------------ .zed/settings.json | 30 +++++++++++++++++++++++++++ Cargo.lock | 2 +- Cargo.toml | 35 ++++++++++++++++---------------- {rust => crates/rust}/Cargo.toml | 11 +++++----- {rust => crates/rust}/src/lib.rs | 0 tombi.toml | 5 +++++ 8 files changed, 59 insertions(+), 66 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/settings.json create mode 100644 .zed/settings.json rename {rust => crates/rust}/Cargo.toml (91%) rename {rust => crates/rust}/src/lib.rs (100%) create mode 100644 tombi.toml diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index c70ed43..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "recommendations": [ - "vadimcn.vscode-lldb", - "barbosshack.crates-io", - "usernamehw.errorlens", - "tamasfe.even-better-toml", - "rust-lang.rust-analyzer", - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 2f432d8..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - // VSCode - "editor.detectIndentation": false, - "editor.insertSpaces": false, - "editor.tabSize": 4, - "files.exclude": { - "**/target": true, - "**/Cargo.lock": true, - }, - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, - "files.trimTrailingWhitespace": true, - "files.watcherExclude": { - "**/.git/**": true, - "**/target/**": true, - }, - // Extensions - "crates.listPreReleases": true, - "evenBetterToml.formatter.alignComments": true, - "evenBetterToml.formatter.alignEntries": false, - "evenBetterToml.formatter.allowedBlankLines": 1, - "evenBetterToml.formatter.arrayAutoExpand": true, - "evenBetterToml.formatter.arrayTrailingComma": true, - "evenBetterToml.formatter.columnWidth": 80, - "evenBetterToml.formatter.reorderKeys": true, - "evenBetterToml.formatter.trailingNewline": true, - "rust-analyzer.imports.granularity.enforce": true, - "rust-analyzer.imports.granularity.group": "module", - "rust-analyzer.imports.group.enable": true, - "rust-analyzer.imports.merge.glob": false, - "rust-analyzer.imports.preferNoStd": true, - "rust-analyzer.showUnlinkedFileNotification": false, -} diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 0000000..c38a1d6 --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,30 @@ +{ + "project_name": null, + "auto_install_extensions": { + "tombi": true, + "cargo-appraiser": true, + }, + "languages": { + "TOML": { + "format_on_save": "on", + "formatter": { "language_server": { "name": "tombi" } }, + }, + }, + "lsp": { + "rust-analyzer": { + "initialization_options": { + "imports": { + "granularity": { "enforce": true, "group": "module" }, + "group": { "enable": true }, + "merge": { "glob": false }, + "preferNoStd": true, + }, + "server": { + "extraEnv": { + "RUSTUP_TOOLCHAIN": "stable", + }, + }, + }, + }, + }, +} diff --git a/Cargo.lock b/Cargo.lock index ae7f35f..a5ee016 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "rust" diff --git a/Cargo.toml b/Cargo.toml index a6209aa..2d22573 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,18 +1,16 @@ [workspace] -members = ["rust"] resolver = "2" +members = ["crates/*"] [workspace.package] -authors = [] -edition = "2024" license-file = "LICENSE.md" + +edition = "2024" rust-version = "1.85.0" -[workspace.lints.rust] -arithmetic_overflow = "forbid" -missing_docs = "forbid" -unsafe_code = "forbid" -unused_doc_comments = "forbid" +[workspace.dependencies] +rust = { path = "crates/rust", version = "=0.0.0", default-features = false } +# crate = { version = "^0", default-features = false } [workspace.lints.clippy] arithmetic_side_effects = "forbid" @@ -24,15 +22,18 @@ indexing_slicing = "forbid" integer_division = "forbid" integer_division_remainder_used = "forbid" transmute_undefined_repr = "forbid" -unchecked_duration_subtraction = "forbid" +unchecked_time_subtraction = "forbid" unwrap_used = "forbid" -[profile.release] -codegen-units = 1 -lto = "fat" -opt-level = 3 -overflow-checks = true -strip = "debuginfo" +[workspace.lints.rust] +arithmetic_overflow = "forbid" +missing_docs = "forbid" +unsafe_code = "forbid" +unused_doc_comments = "forbid" -[workspace.dependencies] -# crate = { version = "^0", default-features = false } +[profile.release] +opt-level = 3 +strip = "debuginfo" +overflow-checks = true +lto = "fat" +codegen-units = 1 diff --git a/rust/Cargo.toml b/crates/rust/Cargo.toml similarity index 91% rename from rust/Cargo.toml rename to crates/rust/Cargo.toml index 617860d..3d130f8 100644 --- a/rust/Cargo.toml +++ b/crates/rust/Cargo.toml @@ -1,18 +1,17 @@ [package] name = "rust" version = "0.0.0" - -authors.workspace = true -edition.workspace = true license-file.workspace = true + +edition.workspace = true rust-version.workspace = true [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs"] -[lints] -workspace = true - [dependencies] # crate = { workspace = true } + +[lints] +workspace = true diff --git a/rust/src/lib.rs b/crates/rust/src/lib.rs similarity index 100% rename from rust/src/lib.rs rename to crates/rust/src/lib.rs diff --git a/tombi.toml b/tombi.toml new file mode 100644 index 0000000..6ee615f --- /dev/null +++ b/tombi.toml @@ -0,0 +1,5 @@ +toml-version = "v1.0.0" + +[format.rules] +indent-style = "tab" +indent-width = 4