Auto merge of #49640 - matklad:cargo-backport, r=alexcrichton

[beta] Update cargo and backport #49612 rust-lang/cargo#5288 fixes a regression where cargo would update registry on every operation.
rust-lang · Apr 5, 2018 · 0e35067 · 0e35067
2 parents 18aaa1d + 4d63e4a
commit 0e35067
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
@@ -1426,7 +1426,7 @@ pub fn abort() -> ! {
 /// ```
 ///
 ///
-#[stable(feature = "getpid", since = "1.27.0")]
+#[stable(feature = "getpid", since = "1.26.0")]
 pub fn id() -> u32 {
     ::sys::os::getpid()
 }

diff --git a/src/tools/cargo b/src/tools/cargo