Skip to content

Commit cabe1cc

Browse files
committed
Upgrade Cargo to the 2021 edition
This didn't actually result in any code changes yet, for now this simply flips the edition flag for all of our crates and documentation.
1 parent 50a0af4 commit cabe1cc

File tree

19 files changed

+21
-21
lines changed

19 files changed

+21
-21
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "cargo"
33
version = "0.59.0"
4-
edition = "2018"
4+
edition = "2021"
55
authors = ["Yehuda Katz <[email protected]>",
66
"Carl Lerche <[email protected]>",
77
"Alex Crichton <[email protected]>"]

benches/benchsuite/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "benchsuite"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://github.com/rust-lang/cargo"
77
repository = "https://github.com/rust-lang/cargo"

benches/capture/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "capture"
33
version = "0.1.0"
4-
edition = "2018"
4+
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
description = "Tool for capturing a real-world workspace for benchmarking."
77

crates/cargo-platform/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-platform"
33
version = "0.1.2"
44
authors = ["The Cargo Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
homepage = "https://github.com/rust-lang/cargo"
88
repository = "https://github.com/rust-lang/cargo"

crates/cargo-test-macro/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-test-macro"
33
version = "0.1.0"
44
authors = ["Jethro Beekman <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
homepage = "https://github.com/rust-lang/cargo"
88
repository = "https://github.com/rust-lang/cargo"

crates/cargo-test-support/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "cargo-test-support"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
55
license = "MIT OR Apache-2.0"
6-
edition = "2018"
6+
edition = "2021"
77

88
[lib]
99
doctest = false

crates/cargo-util/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-util"
33
version = "0.1.1"
44
authors = ["The Cargo Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
homepage = "https://github.com/rust-lang/cargo"
88
repository = "https://github.com/rust-lang/cargo"

crates/crates-io/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "crates-io"
33
version = "0.33.0"
4-
edition = "2018"
4+
edition = "2021"
55
authors = ["Alex Crichton <[email protected]>"]
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"

crates/credential/cargo-credential-1password/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-credential-1password"
33
version = "0.1.0"
44
authors = ["The Rust Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"
88
description = "A Cargo credential process that stores tokens in a 1password vault."

crates/credential/cargo-credential-gnome-secret/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-credential-gnome-secret"
33
version = "0.1.0"
44
authors = ["The Rust Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"
88
description = "A Cargo credential process that stores tokens with GNOME libsecret."

crates/credential/cargo-credential-macos-keychain/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-credential-macos-keychain"
33
version = "0.1.0"
44
authors = ["The Rust Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"
88
description = "A Cargo credential process that stores tokens in a macOS keychain."

crates/credential/cargo-credential-wincred/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-credential-wincred"
33
version = "0.1.0"
44
authors = ["The Rust Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"
88
description = "A Cargo credential process that stores tokens with Windows Credential Manager."

crates/credential/cargo-credential/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-credential"
33
version = "0.1.0"
44
authors = ["The Rust Project Developers"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
repository = "https://github.com/rust-lang/cargo"
88
description = "A library to assist writing Cargo credential helpers."

crates/mdman/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mdman"
33
version = "0.1.0"
44
authors = ["Eric Huss"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT OR Apache-2.0"
77
description = "Creates a man page page from markdown."
88

src/doc/semver-check/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "semver-check"
33
version = "0.1.0"
44
authors = ["Eric Huss"]
5-
edition = "2018"
5+
edition = "2021"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

src/doc/src/getting-started/first-steps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This is all we need to get started. First, let’s check out `Cargo.toml`:
3333
[package]
3434
name = "hello_world"
3535
version = "0.1.0"
36-
edition = "2018"
36+
edition = "2021"
3737

3838
[dependencies]
3939
```

src/doc/src/guide/creating-a-new-project.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Let’s take a closer look at `Cargo.toml`:
2929
[package]
3030
name = "hello_world"
3131
version = "0.1.0"
32-
edition = "2018"
32+
edition = "2021"
3333

3434
[dependencies]
3535

src/doc/src/guide/dependencies.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ crates:
3535
[package]
3636
name = "hello_world"
3737
version = "0.1.0"
38-
edition = "2018"
38+
edition = "2021"
3939

4040
[dependencies]
4141
time = "0.1.12"

src/doc/src/reference/build-script-examples.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Pretty similar to before! Next, the manifest:
147147
[package]
148148
name = "hello-world-from-c"
149149
version = "0.1.0"
150-
edition = "2018"
150+
edition = "2021"
151151
```
152152

153153
For now we’re not going to use any build dependencies, so let’s take a look at
@@ -297,7 +297,7 @@ with `pkg-config` installed. Let's start by setting up the manifest:
297297
[package]
298298
name = "libz-sys"
299299
version = "0.1.0"
300-
edition = "2018"
300+
edition = "2021"
301301
links = "z"
302302

303303
[build-dependencies]
@@ -384,7 +384,7 @@ Here's an example:
384384
[package]
385385
name = "zuser"
386386
version = "0.1.0"
387-
edition = "2018"
387+
edition = "2021"
388388

389389
[dependencies]
390390
libz-sys = "1.0.25"

0 commit comments

Comments
 (0)