]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #49612 - tmccombs:stabilize-getpid, r=kennytm
authorkennytm <kennytm@gmail.com>
Wed, 4 Apr 2018 09:07:26 +0000 (11:07 +0200)
committerGitHub <noreply@github.com>
Wed, 4 Apr 2018 09:07:26 +0000 (11:07 +0200)
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

This will need to be backported to beta (1.26.0)

src/libstd/process.rs

index b463a6d88fe8e76a9cad34c0e3d09733ae7c8faa..40bc84f4bc104a900636a7f0ad5587dcb3cdb269 100644 (file)
@@ -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()
 }