Auto merge of #10000 - alexcrichton:upgrade-edition, r=Eh2406

bors · bors · commit dc6a1d5304ba · 2021-10-23T18:08:27.000Z
Upgrade Cargo to the 2021 edition

While I was poking around in the manifests I also went ahead and removed the `authors` entries since at least the one for Cargo itself is quite outdated and Cargo otherwise doesn't use these any more.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -68,7 +68,9 @@ jobs:
 
     # Deny warnings on CI to avoid warnings getting into the codebase.
     - run: cargo test --features 'deny-warnings'
-    - run: cargo test --features 'deny-warnings' -p cargo-test-support
+    - run: cargo test --features 'deny-warnings' --manifest-path crates/cargo-test-support/Cargo.toml
+      env:
+        CARGO_TARGET_DIR: target
     - run: cargo test -p cargo-platform
     - run: cargo test -p cargo-util
     - run: cargo test --manifest-path crates/mdman/Cargo.toml
@@ -113,6 +115,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: rustup update nightly && rustup default nightly
+    - run: rustup update stable
     - run: rustup component add rust-docs
     - run: ci/validate-man.sh
     # This requires rustfmt, use stable.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,7 @@
 [package]
 name = "cargo"
 version = "0.59.0"
-edition = "2018"
-authors = ["Yehuda Katz <wycats@gmail.com>",
-           "Carl Lerche <me@carllerche.com>",
-           "Alex Crichton <alex@alexcrichton.com>"]
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
diff --git a/benches/benchsuite/Cargo.toml b/benches/benchsuite/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "benchsuite"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"
diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "capture"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Tool for capturing a real-world workspace for benchmarking."
 
diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-platform"
 version = "0.1.2"
-authors = ["The Cargo Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"
diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-test-macro"
 version = "0.1.0"
-authors = ["Jethro Beekman <jethro@fortanix.com>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"
diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
 name = "cargo-test-support"
 version = "0.1.0"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 doctest = false
@@ -24,3 +23,6 @@ tar = { version = "0.4.18", default-features = false }
 termcolor = "1.1.2"
 toml = "0.5.7"
 url = "2.2.2"
+
+[features]
+deny-warnings = []
diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
@@ -5,6 +5,7 @@
 #![allow(clippy::all)]
 #![warn(clippy::needless_borrow)]
 #![warn(clippy::redundant_clone)]
+#![cfg_attr(feature = "deny-warnings", deny(warnings))]
 
 use std::env;
 use std::ffi::OsStr;
diff --git a/crates/cargo-util/Cargo.toml b/crates/cargo-util/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-util"
 version = "0.1.1"
-authors = ["The Cargo Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"
diff --git a/crates/crates-io/Cargo.toml b/crates/crates-io/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "crates-io"
 version = "0.33.0"
-edition = "2018"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = """
diff --git a/crates/credential/cargo-credential-1password/Cargo.toml b/crates/credential/cargo-credential-1password/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-credential-1password"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens in a 1password vault."
diff --git a/crates/credential/cargo-credential-gnome-secret/Cargo.toml b/crates/credential/cargo-credential-gnome-secret/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-credential-gnome-secret"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens with GNOME libsecret."
diff --git a/crates/credential/cargo-credential-macos-keychain/Cargo.toml b/crates/credential/cargo-credential-macos-keychain/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-credential-macos-keychain"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens in a macOS keychain."
diff --git a/crates/credential/cargo-credential-wincred/Cargo.toml b/crates/credential/cargo-credential-wincred/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-credential-wincred"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens with Windows Credential Manager."
diff --git a/crates/credential/cargo-credential/Cargo.toml b/crates/credential/cargo-credential/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "cargo-credential"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"
 description = "A library to assist writing Cargo credential helpers."
diff --git a/crates/mdman/Cargo.toml b/crates/mdman/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "mdman"
 version = "0.1.0"
-authors = ["Eric Huss"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Creates a man page page from markdown."
 
diff --git a/crates/resolver-tests/Cargo.toml b/crates/resolver-tests/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "resolver-tests"
 version = "0.1.0"
-authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
 
 [dependencies]
diff --git a/src/doc/semver-check/Cargo.toml b/src/doc/semver-check/Cargo.toml
@@ -2,7 +2,7 @@
 name = "semver-check"
 version = "0.1.0"
 authors = ["Eric Huss"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/src/doc/src/getting-started/first-steps.md b/src/doc/src/getting-started/first-steps.md
@@ -33,7 +33,7 @@ This is all we need to get started. First, let’s check out `Cargo.toml`:
 [package]
 name = "hello_world"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ```
diff --git a/src/doc/src/guide/creating-a-new-project.md b/src/doc/src/guide/creating-a-new-project.md
@@ -29,7 +29,7 @@ Let’s take a closer look at `Cargo.toml`:
 [package]
 name = "hello_world"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 
diff --git a/src/doc/src/guide/dependencies.md b/src/doc/src/guide/dependencies.md
@@ -35,7 +35,7 @@ crates:
 [package]
 name = "hello_world"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 time = "0.1.12"
diff --git a/src/doc/src/reference/build-script-examples.md b/src/doc/src/reference/build-script-examples.md
@@ -147,7 +147,7 @@ Pretty similar to before! Next, the manifest:
 [package]
 name = "hello-world-from-c"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 ```
 
 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:
 [package]
 name = "libz-sys"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 links = "z"
 
 [build-dependencies]
@@ -384,7 +384,7 @@ Here's an example:
 [package]
 name = "zuser"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libz-sys = "1.0.25"
