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() } 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