Merge branch 'master' into doc_versioning

Author: CPerezz

.github/ISSUE_TEMPLATE/tracking_issue.md

@@ -10,15 +10,9 @@ accepted feature or RFC from implementation to stabilization. Please do not
 file a tracking issue until the feature or RFC has been approved.
 -->
 
-**About tracking issues**
-
-Tracking issues are used to record the overall progress of implementation.
-They are also used as hubs connecting to other relevant issues, e.g., bugs or open design questions.
-A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
-Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.
-
 **Summary**
 
+RFC: [#NNNN](https://github.com/rust-lang/rfcs/pull/NNNN) <!-- If this is an RFC -->
 Original issue: #NNNN <!-- if there is a related issue that spawned this feature -->
 Implementation: #NNNN <!-- link to the PR that implemented this feature if applicable -->
 Documentation: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#my-feature
@@ -32,3 +26,10 @@ Documentation: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#m
 **Future extensions**
 
 <!-- An optional section where you can mention where the feature may be extended in the future, but is explicitly not intended to address. -->
+
+**About tracking issues**
+
+Tracking issues are used to record the overall progress of implementation.
+They are also used as hubs connecting to other relevant issues, e.g., bugs or open design questions.
+A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
+Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.

.github/workflows/contrib.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Install mdbook
       run: |
         mkdir mdbook
-        curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.3/mdbook-v0.4.3-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
+        curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.5/mdbook-v0.4.5-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
         echo `pwd`/mdbook >> $GITHUB_PATH
     - name: Deploy docs
       run: |

.github/workflows/main.yml

@@ -103,7 +103,7 @@ jobs:
     - run: cd src/doc/semver-check && cargo +stable run
     - run: |
         mkdir mdbook
-        curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
+        curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.5/mdbook-v0.4.5-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
         echo `pwd`/mdbook >> $GITHUB_PATH
     - run: cargo doc --no-deps
     - run: cd src/doc && mdbook build --dest-dir ../../target/doc

CHANGELOG.md

@@ -1,20 +1,70 @@
 # Changelog
 
+## Cargo 1.51 (2021-03-25)
+[75d5d8cf...HEAD](https://github.com/rust-lang/cargo/compare/75d5d8cf...HEAD)
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Nightly only
+
 ## Cargo 1.50 (2021-02-11)
-[8662ab42...HEAD](https://github.com/rust-lang/cargo/compare/8662ab42...HEAD)
+[8662ab42...rust-1.50.0](https://github.com/rust-lang/cargo/compare/8662ab42...rust-1.50.0)
 
 ### Added
 - Added the `doc` field to `cargo metadata`, which indicates if a target is
   documented.
   [#8869](https://github.com/rust-lang/cargo/pull/8869)
+- Added `RUSTC_WORKSPACE_WRAPPER`, an alternate RUSTC wrapper that only runs
+  for the local workspace packages, and caches its artifacts independently of
+  non-wrapped builds.
+  [#8976](https://github.com/rust-lang/cargo/pull/8976)
+- Added `--workspace` to `cargo update` to update only the workspace members,
+  and not their dependencies. This is particularly useful if you update the
+  version in `Cargo.toml` and want to update `Cargo.lock` without running any
+  other commands.
+  [#8725](https://github.com/rust-lang/cargo/pull/8725)
 
 ### Changed
 - `.crate` files uploaded to a registry are now built with reproducible
   settings, so that the same `.crate` file created on different machines
   should be identical.
   [#8864](https://github.com/rust-lang/cargo/pull/8864)
+- Git dependencies that specify more than one of `branch`, `tag`, or `rev` are
+  now rejected.
+  [#8984](https://github.com/rust-lang/cargo/pull/8984)
+- The `rerun-if-changed` build script directive can now point to a directory,
+  in which case Cargo will check if any file in that directory changes.
+  [#8973](https://github.com/rust-lang/cargo/pull/8973)
+- Slightly optimize `cargo vendor`
+  [#8937](https://github.com/rust-lang/cargo/pull/8937)
+- If Cargo cannot determine the username or email address, `cargo new` will no
+  longer fail, and instead create an empty authors list.
+  [#8912](https://github.com/rust-lang/cargo/pull/8912)
+- Add period to allowed feature name characters.
+  [#8932](https://github.com/rust-lang/cargo/pull/8932)
+- The progress bar width has been reduced to provide more room to display the
+  crates currently being built.
+  [#8892](https://github.com/rust-lang/cargo/pull/8892)
+- `cargo new` will now support `includeIf` directives in `.gitconfig` to match
+  the correct directory when determining the username and email address.
+  [#8886](https://github.com/rust-lang/cargo/pull/8886)
 
 ### Fixed
+- Fixed `cargo metadata` and `cargo tree` to only download packages for the
+  requested target.
+  [#8987](https://github.com/rust-lang/cargo/pull/8987)
+- Updated libgit2, which brings in many fixes, particularly fixing a zlib
+  error that occasionally appeared on 32-bit systems.
+  [#8998](https://github.com/rust-lang/cargo/pull/8998)
+- Fixed stack overflow with a circular dev-dependency that uses the `links`
+  field.
+  [#8969](https://github.com/rust-lang/cargo/pull/8969)
+- Fixed `cargo publish` failing on some filesystems, particularly 9p on WSL2.
+  [#8950](https://github.com/rust-lang/cargo/pull/8950)
 
 ### Nightly only
 - Allow `resolver="1"` to specify the original feature resolution behavior.
@@ -23,6 +73,14 @@
   and `cargo:rustc-link-arg` build script options.
   [docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#extra-link-arg)
   [#8441](https://github.com/rust-lang/cargo/pull/8441)
+- Implemented external credential process support, and added `cargo logout`.
+  ([RFC 2730](https://github.com/rust-lang/rfcs/blob/master/text/2730-cargo-token-from-process.md))
+  ([docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#credential-process))
+  [#8934](https://github.com/rust-lang/cargo/pull/8934)
+- Fix panic with `-Zbuild-std` and no roots.
+  [#8942](https://github.com/rust-lang/cargo/pull/8942)
+- Set docs.rs as the default extern-map for crates.io
+  [#8877](https://github.com/rust-lang/cargo/pull/8877)
 
 ## Cargo 1.49 (2020-12-31)
 [75615f8e...rust-1.49.0](https://github.com/rust-lang/cargo/compare/75615f8e...rust-1.49.0)
@@ -79,8 +137,6 @@
 - Fixed the new feature resolver downloading extra dependencies that weren't
   strictly necessary.
   [#8823](https://github.com/rust-lang/cargo/pull/8823)
-- Vendored builds now work with `-Zbuild-std`.
-  [#8834](https://github.com/rust-lang/cargo/pull/8834)
 
 ## Cargo 1.48 (2020-11-19)
 [51b66125...rust-1.48.0](https://github.com/rust-lang/cargo/compare/51b66125...rust-1.48.0)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.51.0"
+version = "0.52.0"
 edition = "2018"
 authors = ["Yehuda Katz <[email protected]>",
            "Carl Lerche <[email protected]>",
@@ -22,7 +22,7 @@ path = "src/cargo/lib.rs"
 atty = "0.2"
 bytesize = "1.0"
 cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" }
-crates-io = { path = "crates/crates-io", version = "0.31.1" }
+crates-io = { path = "crates/crates-io", version = "0.33.0" }
 crossbeam-utils = "0.8"
 crypto-hash = "0.3.1"
 curl = { version = "0.4.23", features = ["http2"] }
@@ -32,8 +32,8 @@ pretty_env_logger = { version = "0.4", optional = true }
 anyhow = "1.0"
 filetime = "0.2.9"
 flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
-git2 = "0.13.12"
-git2-curl = "0.14.0"
+git2 = "0.13.16"
+git2-curl = "0.14.1"
 glob = "0.3.0"
 hex = "0.4"
 home = "0.5"
@@ -44,7 +44,7 @@ jobserver = "0.1.21"
 lazycell = "1.2.0"
 libc = "0.2"
 log = "0.4.6"
-libgit2-sys = "0.12.14"
+libgit2-sys = "0.12.18"
 memchr = "2.1.3"
 num_cpus = "1.0"
 opener = "0.4"

crates/cargo-test-support/Cargo.toml

@@ -13,10 +13,11 @@ cargo = { path = "../.." }
 cargo-test-macro = { path = "../cargo-test-macro" }
 filetime = "0.2"
 flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
-git2 = "0.13"
+git2 = "0.13.16"
 glob = "0.3"
 lazy_static = "1.0"
 remove_dir_all = "0.5"
 serde_json = "1.0"
 tar = { version = "0.4.18", default-features = false }
+toml = "0.5.7"
 url = "2.0"

crates/cargo-test-support/src/git.rs

@@ -41,6 +41,7 @@ use some of the helper functions in this file to interact with the repository.
 use crate::{path2url, project, Project, ProjectBuilder};
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::sync::Once;
 use url::Url;
 
 #[must_use]
@@ -124,11 +125,25 @@ impl Repository {
 
 /// Initialize a new repository at the given path.
 pub fn init(path: &Path) -> git2::Repository {
+    default_search_path();
     let repo = t!(git2::Repository::init(path));
     default_repo_cfg(&repo);
     repo
 }
 
+fn default_search_path() {
+    use crate::paths::GLOBAL_ROOT;
+    use git2::{opts::set_search_path, ConfigLevel};
+    static INIT: Once = Once::new();
+    INIT.call_once(|| unsafe {
+        let path = GLOBAL_ROOT.join("blank_git_search_path");
+        t!(set_search_path(ConfigLevel::System, &path));
+        t!(set_search_path(ConfigLevel::Global, &path));
+        t!(set_search_path(ConfigLevel::XDG, &path));
+        t!(set_search_path(ConfigLevel::ProgramData, &path));
+    })
+}
+
 fn default_repo_cfg(repo: &git2::Repository) {
     let mut cfg = t!(repo.config());
     t!(cfg.set_str("user.email", "[email protected]"));

crates/cargo-test-support/src/paths.rs

@@ -14,7 +14,7 @@ use std::sync::Mutex;
 static CARGO_INTEGRATION_TEST_DIR: &str = "cit";
 
 lazy_static! {
-    static ref GLOBAL_ROOT: PathBuf = {
+    pub static ref GLOBAL_ROOT: PathBuf = {
         let mut path = t!(env::current_exe());
         path.pop(); // chop off exe name
         path.pop(); // chop off 'debug'
@@ -127,10 +127,8 @@ impl CargoPathExt for Path {
             if let Err(e) = remove_dir_all::remove_dir_all(self) {
                 panic!("failed to remove {:?}: {:?}", self, e)
             }
-        } else {
-            if let Err(e) = fs::remove_file(self) {
-                panic!("failed to remove {:?}: {:?}", self, e)
-            }
+        } else if let Err(e) = fs::remove_file(self) {
+            panic!("failed to remove {:?}: {:?}", self, e)
         }
     }
 

crates/cargo-test-support/src/registry.rs

@@ -146,6 +146,8 @@ pub struct Package {
     invalid_json: bool,
     proc_macro: bool,
     links: Option<String>,
+    rust_version: Option<String>,
+    cargo_features: Vec<String>,
 }
 
 #[derive(Clone)]
@@ -247,6 +249,8 @@ impl Package {
             invalid_json: false,
             proc_macro: false,
             links: None,
+            rust_version: None,
+            cargo_features: Vec::new(),
         }
     }
 
@@ -363,6 +367,12 @@ impl Package {
         self
     }
 
+    /// Specify a minimal Rust version.
+    pub fn rust_version(&mut self, rust_version: &str) -> &mut Package {
+        self.rust_version = Some(rust_version.into());
+        self
+    }
+
     /// Causes the JSON line emitted in the index to be invalid, presumably
     /// causing Cargo to skip over this version.
     pub fn invalid_json(&mut self, invalid: bool) -> &mut Package {
@@ -375,6 +385,11 @@ impl Package {
         self
     }
 
+    pub fn cargo_feature(&mut self, feature: &str) -> &mut Package {
+        self.cargo_features.push(feature.to_owned());
+        self
+    }
+
     /// Creates the package and place it in the registry.
     ///
     /// This does not actually use Cargo's publishing system, but instead
@@ -502,15 +517,29 @@ impl Package {
     }
 
     fn append_manifest<W: Write>(&self, ar: &mut Builder<W>) {
-        let mut manifest = format!(
+        let mut manifest = String::new();
+
+        if !self.cargo_features.is_empty() {
+            manifest.push_str(&format!(
+                "cargo-features = {}\n\n",
+                toml::to_string(&self.cargo_features).unwrap()
+            ));
+        }
+
+        manifest.push_str(&format!(
             r#"
             [package]
             name = "{}"
             version = "{}"
             authors = []
         "#,
             self.name, self.vers
-        );
+        ));
+
+        if let Some(version) = &self.rust_version {
+            manifest.push_str(&format!("rust-version = \"{}\"", version));
+        }
+
         for dep in self.deps.iter() {
             let target = match dep.target {
                 None => String::new(),

crates/crates-io/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crates-io"
-version = "0.31.1"
+version = "0.33.0"
 edition = "2018"
 authors = ["Alex Crichton <[email protected]>"]
 license = "MIT OR Apache-2.0"