From c0dec7de1cfdcd813118444a0dac8af31c18486c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 4 Apr 2018 10:16:36 +0300
Subject: [PATCH 1/2] [beta] Update cargo

https://github.com/rust-lang/cargo/pull/5288 fixes a regression
where cargo would update registry on every operation.
---
 src/tools/cargo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/cargo b/src/tools/cargo
index d63299b6eafae..0dabed904b739 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit d63299b6eafae99bfe1fd5ddc75bc7cf67ed58f9
+Subproject commit 0dabed904b739d8a6d1aee37070b10d60599d50a

From 4d63e4a2d269527a38f13e5647e3b3f150a31ed3 Mon Sep 17 00:00:00 2001
From: Thayne McCombs <astrothayne@gmail.com>
Date: Mon, 2 Apr 2018 19:34:06 -0600
Subject: [PATCH 2/2] Fix "since" version for getpid feature.

It was stabilized right before the beta branch was cut for 1.26.0.

See https://github.com/rust-lang/rust/pull/49523#issuecomment-377996315
---
 src/libstd/process.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index b463a6d88fe8e..40bc84f4bc104 100644
--- 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()
 }