From 679df2adf132d2a597945ef03d7fc2ddea2ed4b3 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 16 Jan 2023 16:33:01 +0100 Subject: [PATCH 1/2] Specify rust-version via workspace.package --- Cargo.toml | 3 +++ crates/base-db/Cargo.toml | 2 +- crates/cfg/Cargo.toml | 2 +- crates/flycheck/Cargo.toml | 2 +- crates/hir-def/Cargo.toml | 2 +- crates/hir-expand/Cargo.toml | 2 +- crates/hir-ty/Cargo.toml | 2 +- crates/hir/Cargo.toml | 2 +- crates/ide-assists/Cargo.toml | 2 +- crates/ide-completion/Cargo.toml | 2 +- crates/ide-db/Cargo.toml | 2 +- crates/ide-diagnostics/Cargo.toml | 2 +- crates/ide-ssr/Cargo.toml | 2 +- crates/ide/Cargo.toml | 2 +- crates/intern/Cargo.toml | 2 +- crates/limit/Cargo.toml | 2 +- crates/mbe/Cargo.toml | 2 +- crates/parser/Cargo.toml | 2 +- crates/paths/Cargo.toml | 2 +- crates/proc-macro-api/Cargo.toml | 2 +- crates/proc-macro-srv-cli/Cargo.toml | 2 +- crates/proc-macro-srv/Cargo.toml | 2 +- crates/proc-macro-test/Cargo.toml | 2 +- crates/proc-macro-test/imp/Cargo.toml | 1 - crates/profile/Cargo.toml | 2 +- crates/project-model/Cargo.toml | 2 +- crates/rust-analyzer/Cargo.toml | 2 +- crates/sourcegen/Cargo.toml | 2 +- crates/stdx/Cargo.toml | 2 +- crates/syntax/Cargo.toml | 2 +- crates/syntax/fuzz/Cargo.toml | 2 +- crates/test-utils/Cargo.toml | 2 +- crates/text-edit/Cargo.toml | 2 +- crates/toolchain/Cargo.toml | 2 +- crates/tt/Cargo.toml | 2 +- crates/vfs-notify/Cargo.toml | 2 +- crates/vfs/Cargo.toml | 2 +- 37 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 286ef1e7dc..669a9cebc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,9 @@ members = ["xtask/", "lib/*", "crates/*"] exclude = ["crates/proc-macro-test/imp"] +[workspace.package] +rust-version = "1.66" + [profile.dev] # Disabling debug info speeds up builds a bunch, # and we don't rely on it for debugging that much. diff --git a/crates/base-db/Cargo.toml b/crates/base-db/Cargo.toml index a484ecec68..b3e7143f18 100644 --- a/crates/base-db/Cargo.toml +++ b/crates/base-db/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/cfg/Cargo.toml b/crates/cfg/Cargo.toml index 2857420c28..da7934f988 100644 --- a/crates/cfg/Cargo.toml +++ b/crates/cfg/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml index d3bad64fd3..67f03c3524 100644 --- a/crates/flycheck/Cargo.toml +++ b/crates/flycheck/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml index a107842770..d9722bf544 100644 --- a/crates/hir-def/Cargo.toml +++ b/crates/hir-def/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml index a73e690a7e..d2ac98a54b 100644 --- a/crates/hir-expand/Cargo.toml +++ b/crates/hir-expand/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml index 75b33da1f2..2eb29bbdcf 100644 --- a/crates/hir-ty/Cargo.toml +++ b/crates/hir-ty/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml index f780e3f53c..d98f2e11a5 100644 --- a/crates/hir/Cargo.toml +++ b/crates/hir/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide-assists/Cargo.toml b/crates/ide-assists/Cargo.toml index b9260473b1..e6b65e6f76 100644 --- a/crates/ide-assists/Cargo.toml +++ b/crates/ide-assists/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide-completion/Cargo.toml b/crates/ide-completion/Cargo.toml index 11310e2f12..b1b4fe1aed 100644 --- a/crates/ide-completion/Cargo.toml +++ b/crates/ide-completion/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide-db/Cargo.toml b/crates/ide-db/Cargo.toml index f48cce58c6..952407067f 100644 --- a/crates/ide-db/Cargo.toml +++ b/crates/ide-db/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide-diagnostics/Cargo.toml b/crates/ide-diagnostics/Cargo.toml index 7e9a1125d7..96ef4c592b 100644 --- a/crates/ide-diagnostics/Cargo.toml +++ b/crates/ide-diagnostics/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide-ssr/Cargo.toml b/crates/ide-ssr/Cargo.toml index 7be62a8d9f..cc5a9e978f 100644 --- a/crates/ide-ssr/Cargo.toml +++ b/crates/ide-ssr/Cargo.toml @@ -5,7 +5,7 @@ description = "Structural search and replace of Rust code" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index 397383bc3a..f800dcdf1f 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/intern/Cargo.toml b/crates/intern/Cargo.toml index 78007fc860..faf6950171 100644 --- a/crates/intern/Cargo.toml +++ b/crates/intern/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/limit/Cargo.toml b/crates/limit/Cargo.toml index 3536f73da7..ae52553d39 100644 --- a/crates/limit/Cargo.toml +++ b/crates/limit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [features] tracking = [] diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml index bce2fc9a70..c0a9d82921 100644 --- a/crates/mbe/Cargo.toml +++ b/crates/mbe/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index d1420de893..0ded0070b8 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml index d23a63d2a9..54586260e1 100644 --- a/crates/paths/Cargo.toml +++ b/crates/paths/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/proc-macro-api/Cargo.toml b/crates/proc-macro-api/Cargo.toml index f261f3def4..686ca04e77 100644 --- a/crates/proc-macro-api/Cargo.toml +++ b/crates/proc-macro-api/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/proc-macro-srv-cli/Cargo.toml b/crates/proc-macro-srv-cli/Cargo.toml index 7991e125ab..d75a24b27c 100644 --- a/crates/proc-macro-srv-cli/Cargo.toml +++ b/crates/proc-macro-srv-cli/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [dependencies] proc-macro-srv = { version = "0.0.0", path = "../proc-macro-srv" } diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index a136abc12b..e867d09a5e 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/proc-macro-test/Cargo.toml b/crates/proc-macro-test/Cargo.toml index d2a79f9107..a44cbf6426 100644 --- a/crates/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-test/Cargo.toml @@ -3,7 +3,7 @@ name = "proc-macro-test" version = "0.0.0" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true publish = false [lib] diff --git a/crates/proc-macro-test/imp/Cargo.toml b/crates/proc-macro-test/imp/Cargo.toml index 1bd14070e9..2a36737cef 100644 --- a/crates/proc-macro-test/imp/Cargo.toml +++ b/crates/proc-macro-test/imp/Cargo.toml @@ -3,7 +3,6 @@ name = "proc-macro-test-impl" version = "0.0.0" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" publish = false [lib] diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 01d1735bf7..9796140b2c 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml index 39902a5321..dc90c5d942 100644 --- a/crates/project-model/Cargo.toml +++ b/crates/project-model/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 56f14fe187..b4461ea637 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -8,7 +8,7 @@ documentation = "https://rust-analyzer.github.io/manual.html" license = "MIT OR Apache-2.0" autobins = false edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/sourcegen/Cargo.toml b/crates/sourcegen/Cargo.toml index 593dc4e55b..cade32cda8 100644 --- a/crates/sourcegen/Cargo.toml +++ b/crates/sourcegen/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml index f7b7d09640..f73f099bbf 100644 --- a/crates/stdx/Cargo.toml +++ b/crates/stdx/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 00743cca55..fbe2799b21 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -5,7 +5,7 @@ description = "Comment and whitespace preserving parser for the Rust language" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/syntax/fuzz/Cargo.toml b/crates/syntax/fuzz/Cargo.toml index f295c40065..d58470b223 100644 --- a/crates/syntax/fuzz/Cargo.toml +++ b/crates/syntax/fuzz/Cargo.toml @@ -4,7 +4,7 @@ name = "syntax-fuzz" version = "0.0.1" publish = false edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [package.metadata] cargo-fuzz = true diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 1047373b1c..47828b6b3a 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/text-edit/Cargo.toml b/crates/text-edit/Cargo.toml index 8df7e1af61..e42437d8a5 100644 --- a/crates/text-edit/Cargo.toml +++ b/crates/text-edit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/toolchain/Cargo.toml b/crates/toolchain/Cargo.toml index a6a3ae742a..750cced404 100644 --- a/crates/toolchain/Cargo.toml +++ b/crates/toolchain/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/tt/Cargo.toml b/crates/tt/Cargo.toml index 4f2103f3a9..372027e397 100644 --- a/crates/tt/Cargo.toml +++ b/crates/tt/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml index 061f3c157a..6ccb06ac72 100644 --- a/crates/vfs-notify/Cargo.toml +++ b/crates/vfs-notify/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false diff --git a/crates/vfs/Cargo.toml b/crates/vfs/Cargo.toml index e55bf6f293..f754917ac2 100644 --- a/crates/vfs/Cargo.toml +++ b/crates/vfs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" description = "TBD" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version.workspace = true [lib] doctest = false From e4858fe480631a8c52c2450be9e92e33082589ae Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 16 Jan 2023 16:41:47 +0100 Subject: [PATCH 2/2] Specify authors, edition and license via workspace.package --- Cargo.toml | 3 +++ crates/base-db/Cargo.toml | 6 ++++-- crates/cfg/Cargo.toml | 6 ++++-- crates/flycheck/Cargo.toml | 6 ++++-- crates/hir-def/Cargo.toml | 6 ++++-- crates/hir-expand/Cargo.toml | 6 ++++-- crates/hir-ty/Cargo.toml | 6 ++++-- crates/hir/Cargo.toml | 6 ++++-- crates/ide-assists/Cargo.toml | 6 ++++-- crates/ide-completion/Cargo.toml | 6 ++++-- crates/ide-db/Cargo.toml | 6 ++++-- crates/ide-diagnostics/Cargo.toml | 6 ++++-- crates/ide-ssr/Cargo.toml | 6 ++++-- crates/ide/Cargo.toml | 6 ++++-- crates/intern/Cargo.toml | 6 ++++-- crates/limit/Cargo.toml | 6 ++++-- crates/mbe/Cargo.toml | 6 ++++-- crates/parser/Cargo.toml | 6 ++++-- crates/paths/Cargo.toml | 6 ++++-- crates/proc-macro-api/Cargo.toml | 6 ++++-- crates/proc-macro-srv-cli/Cargo.toml | 6 ++++-- crates/proc-macro-srv/Cargo.toml | 6 ++++-- crates/proc-macro-test/Cargo.toml | 8 +++++--- crates/profile/Cargo.toml | 6 ++++-- crates/project-model/Cargo.toml | 6 ++++-- crates/rust-analyzer/Cargo.toml | 7 ++++--- crates/sourcegen/Cargo.toml | 6 ++++-- crates/stdx/Cargo.toml | 6 ++++-- crates/syntax/Cargo.toml | 6 ++++-- crates/syntax/fuzz/Cargo.toml | 5 ++++- crates/test-utils/Cargo.toml | 6 ++++-- crates/text-edit/Cargo.toml | 6 ++++-- crates/toolchain/Cargo.toml | 6 ++++-- crates/tt/Cargo.toml | 6 ++++-- crates/vfs-notify/Cargo.toml | 6 ++++-- crates/vfs/Cargo.toml | 6 ++++-- 36 files changed, 144 insertions(+), 71 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 669a9cebc6..8bd95a8d3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,9 @@ exclude = ["crates/proc-macro-test/imp"] [workspace.package] rust-version = "1.66" +edition = "2021" +license = "MIT OR Apache-2.0" +authors = ["rust-analyzer team"] [profile.dev] # Disabling debug info speeds up builds a bunch, diff --git a/crates/base-db/Cargo.toml b/crates/base-db/Cargo.toml index b3e7143f18..222ed1cded 100644 --- a/crates/base-db/Cargo.toml +++ b/crates/base-db/Cargo.toml @@ -2,8 +2,10 @@ name = "base-db" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/cfg/Cargo.toml b/crates/cfg/Cargo.toml index da7934f988..496da97ddc 100644 --- a/crates/cfg/Cargo.toml +++ b/crates/cfg/Cargo.toml @@ -2,8 +2,10 @@ name = "cfg" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml index 67f03c3524..7831392345 100644 --- a/crates/flycheck/Cargo.toml +++ b/crates/flycheck/Cargo.toml @@ -2,8 +2,10 @@ name = "flycheck" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml index d9722bf544..1d5f9d3db4 100644 --- a/crates/hir-def/Cargo.toml +++ b/crates/hir-def/Cargo.toml @@ -2,8 +2,10 @@ name = "hir-def" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml index d2ac98a54b..c37bd502a0 100644 --- a/crates/hir-expand/Cargo.toml +++ b/crates/hir-expand/Cargo.toml @@ -2,8 +2,10 @@ name = "hir-expand" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml index 2eb29bbdcf..325e3105f2 100644 --- a/crates/hir-ty/Cargo.toml +++ b/crates/hir-ty/Cargo.toml @@ -2,8 +2,10 @@ name = "hir-ty" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml index d98f2e11a5..0bf03e0c85 100644 --- a/crates/hir/Cargo.toml +++ b/crates/hir/Cargo.toml @@ -2,8 +2,10 @@ name = "hir" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide-assists/Cargo.toml b/crates/ide-assists/Cargo.toml index e6b65e6f76..247db7b46b 100644 --- a/crates/ide-assists/Cargo.toml +++ b/crates/ide-assists/Cargo.toml @@ -2,8 +2,10 @@ name = "ide-assists" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide-completion/Cargo.toml b/crates/ide-completion/Cargo.toml index b1b4fe1aed..7ab44d92b9 100644 --- a/crates/ide-completion/Cargo.toml +++ b/crates/ide-completion/Cargo.toml @@ -2,8 +2,10 @@ name = "ide-completion" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide-db/Cargo.toml b/crates/ide-db/Cargo.toml index 952407067f..d85130cc9f 100644 --- a/crates/ide-db/Cargo.toml +++ b/crates/ide-db/Cargo.toml @@ -2,8 +2,10 @@ name = "ide-db" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide-diagnostics/Cargo.toml b/crates/ide-diagnostics/Cargo.toml index 96ef4c592b..cb453a0ddc 100644 --- a/crates/ide-diagnostics/Cargo.toml +++ b/crates/ide-diagnostics/Cargo.toml @@ -2,8 +2,10 @@ name = "ide-diagnostics" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide-ssr/Cargo.toml b/crates/ide-ssr/Cargo.toml index cc5a9e978f..ddc2ba9c14 100644 --- a/crates/ide-ssr/Cargo.toml +++ b/crates/ide-ssr/Cargo.toml @@ -2,9 +2,11 @@ name = "ide-ssr" version = "0.0.0" description = "Structural search and replace of Rust code" -license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index f800dcdf1f..00c7cffbf4 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml @@ -2,8 +2,10 @@ name = "ide" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/intern/Cargo.toml b/crates/intern/Cargo.toml index faf6950171..6fd35c429c 100644 --- a/crates/intern/Cargo.toml +++ b/crates/intern/Cargo.toml @@ -2,8 +2,10 @@ name = "intern" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/limit/Cargo.toml b/crates/limit/Cargo.toml index ae52553d39..c088869099 100644 --- a/crates/limit/Cargo.toml +++ b/crates/limit/Cargo.toml @@ -2,8 +2,10 @@ name = "limit" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [features] diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml index c0a9d82921..3844abd63d 100644 --- a/crates/mbe/Cargo.toml +++ b/crates/mbe/Cargo.toml @@ -2,8 +2,10 @@ name = "mbe" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index 0ded0070b8..10d4f7d8ae 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -2,8 +2,10 @@ name = "parser" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml index 54586260e1..e24e6eceff 100644 --- a/crates/paths/Cargo.toml +++ b/crates/paths/Cargo.toml @@ -2,8 +2,10 @@ name = "paths" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/proc-macro-api/Cargo.toml b/crates/proc-macro-api/Cargo.toml index 686ca04e77..c547bb7c4f 100644 --- a/crates/proc-macro-api/Cargo.toml +++ b/crates/proc-macro-api/Cargo.toml @@ -2,8 +2,10 @@ name = "proc-macro-api" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/proc-macro-srv-cli/Cargo.toml b/crates/proc-macro-srv-cli/Cargo.toml index d75a24b27c..a4740f00cb 100644 --- a/crates/proc-macro-srv-cli/Cargo.toml +++ b/crates/proc-macro-srv-cli/Cargo.toml @@ -2,8 +2,10 @@ name = "proc-macro-srv-cli" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [dependencies] diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index e867d09a5e..44b0b3f19f 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -2,8 +2,10 @@ name = "proc-macro-srv" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/proc-macro-test/Cargo.toml b/crates/proc-macro-test/Cargo.toml index a44cbf6426..721e89b019 100644 --- a/crates/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-test/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "proc-macro-test" version = "0.0.0" -license = "MIT OR Apache-2.0" -edition = "2021" -rust-version.workspace = true publish = false +authors.workspace = true +edition.workspace = true +license.workspace = true +rust-version.workspace = true + [lib] doctest = false diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 9796140b2c..a54becf29a 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -2,8 +2,10 @@ name = "profile" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml index dc90c5d942..52af73150f 100644 --- a/crates/project-model/Cargo.toml +++ b/crates/project-model/Cargo.toml @@ -2,8 +2,10 @@ name = "project-model" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index b4461ea637..8fb286e149 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "rust-analyzer" version = "0.0.0" -authors = ["rust-analyzer Team"] homepage = "https://github.com/rust-analyzer/rust-analyzer" description = "A language server for the Rust programming language" documentation = "https://rust-analyzer.github.io/manual.html" -license = "MIT OR Apache-2.0" autobins = false -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/sourcegen/Cargo.toml b/crates/sourcegen/Cargo.toml index cade32cda8..fb2b9ebef5 100644 --- a/crates/sourcegen/Cargo.toml +++ b/crates/sourcegen/Cargo.toml @@ -2,8 +2,10 @@ name = "sourcegen" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml index f73f099bbf..c881f2fd3f 100644 --- a/crates/stdx/Cargo.toml +++ b/crates/stdx/Cargo.toml @@ -2,8 +2,10 @@ name = "stdx" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index fbe2799b21..e5212414a0 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -2,9 +2,11 @@ name = "syntax" version = "0.0.0" description = "Comment and whitespace preserving parser for the Rust language" -license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/syntax/fuzz/Cargo.toml b/crates/syntax/fuzz/Cargo.toml index d58470b223..802141e591 100644 --- a/crates/syntax/fuzz/Cargo.toml +++ b/crates/syntax/fuzz/Cargo.toml @@ -3,7 +3,10 @@ name = "syntax-fuzz" version = "0.0.1" publish = false -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [package.metadata] diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 47828b6b3a..34cc1de767 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -2,8 +2,10 @@ name = "test-utils" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/text-edit/Cargo.toml b/crates/text-edit/Cargo.toml index e42437d8a5..337cd23473 100644 --- a/crates/text-edit/Cargo.toml +++ b/crates/text-edit/Cargo.toml @@ -2,8 +2,10 @@ name = "text-edit" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/toolchain/Cargo.toml b/crates/toolchain/Cargo.toml index 750cced404..a283f9a884 100644 --- a/crates/toolchain/Cargo.toml +++ b/crates/toolchain/Cargo.toml @@ -2,8 +2,10 @@ name = "toolchain" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/tt/Cargo.toml b/crates/tt/Cargo.toml index 372027e397..7fc7e6edba 100644 --- a/crates/tt/Cargo.toml +++ b/crates/tt/Cargo.toml @@ -2,8 +2,10 @@ name = "tt" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml index 6ccb06ac72..9c50de26aa 100644 --- a/crates/vfs-notify/Cargo.toml +++ b/crates/vfs-notify/Cargo.toml @@ -2,8 +2,10 @@ name = "vfs-notify" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib] diff --git a/crates/vfs/Cargo.toml b/crates/vfs/Cargo.toml index f754917ac2..3e7e2da81f 100644 --- a/crates/vfs/Cargo.toml +++ b/crates/vfs/Cargo.toml @@ -2,8 +2,10 @@ name = "vfs" version = "0.0.0" description = "TBD" -license = "MIT OR Apache-2.0" -edition = "2021" + +authors.workspace = true +edition.workspace = true +license.workspace = true rust-version.workspace = true [lib]