Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 6290785

Browse files
borsbors
committed
Auto merge of rust-lang#13964 - Veykril:workspace.package, r=Veykril
Specify authors, edition, license and rust-versian via workspace.package
2 parents e11c0e3 + e4858fe commit 6290785

File tree

37 files changed

+181
-106
lines changed

37 files changed

+181
-106
lines changed

‎Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
members = ["xtask/", "lib/*", "crates/*"]
33
exclude = ["crates/proc-macro-test/imp"]
44

5+
[workspace.package]
6+
rust-version = "1.66"
7+
edition = "2021"
8+
license = "MIT OR Apache-2.0"
9+
authors = ["rust-analyzer team"]
10+
511
[profile.dev]
612
# Disabling debug info speeds up builds a bunch,
713
# and we don't rely on it for debugging that much.

‎crates/base-db/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "base-db"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/cfg/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "cfg"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/flycheck/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "flycheck"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/hir-def/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "hir-def"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/hir-expand/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "hir-expand"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/hir-ty/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "hir-ty"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/hir/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "hir"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/ide-assists/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "ide-assists"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/ide-completion/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "ide-completion"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/ide-db/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "ide-db"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/ide-diagnostics/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "ide-diagnostics"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/ide-ssr/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
name = "ide-ssr"
33
version = "0.0.0"
44
description = "Structural search and replace of Rust code"
5-
license = "MIT OR Apache-2.0"
65
repository = "https://github.com/rust-lang/rust-analyzer"
7-
edition = "2021"
8-
rust-version = "1.65"
6+
7+
authors.workspace = true
8+
edition.workspace = true
9+
license.workspace = true
10+
rust-version.workspace = true
911

1012
[lib]
1113
doctest = false

‎crates/ide/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "ide"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/intern/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "intern"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/limit/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "limit"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[features]
1012
tracking = []

‎crates/mbe/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "mbe"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/parser/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "parser"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/paths/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "paths"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/proc-macro-api/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "proc-macro-api"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/proc-macro-srv-cli/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "proc-macro-srv-cli"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[dependencies]
1012
proc-macro-srv = { version = "0.0.0", path = "../proc-macro-srv" }

‎crates/proc-macro-srv/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "proc-macro-srv"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/proc-macro-test/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[package]
22
name = "proc-macro-test"
33
version = "0.0.0"
4-
license = "MIT OR Apache-2.0"
5-
edition = "2021"
6-
rust-version = "1.65"
74
publish = false
85

6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
10+
911
[lib]
1012
doctest = false
1113

‎crates/proc-macro-test/imp/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "proc-macro-test-impl"
33
version = "0.0.0"
44
license = "MIT OR Apache-2.0"
55
edition = "2021"
6-
rust-version = "1.65"
76
publish = false
87

98
[lib]

‎crates/profile/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "profile"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

‎crates/project-model/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
name = "project-model"
33
version = "0.0.0"
44
description = "TBD"
5-
license = "MIT OR Apache-2.0"
6-
edition = "2021"
7-
rust-version = "1.65"
5+
6+
authors.workspace = true
7+
edition.workspace = true
8+
license.workspace = true
9+
rust-version.workspace = true
810

911
[lib]
1012
doctest = false

0 commit comments

Comments
 (0)