about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-04 11:07:26 +0200
committerGitHub <noreply@github.com>2018-04-04 11:07:26 +0200
commit19c07d382a666271a87e4df41db1bc3f2298e27d (patch)
tree3aa66261d7fb36c923c825e64428b2d3a19031a2 /src/libstd
parentb3b7e776cb92f74c25c268f9031abdc5588a1ded (diff)
parent9ab5788e0e73d1d7edbc025627e34bb8d4fa9bdd (diff)
downloadrust-19c07d382a666271a87e4df41db1bc3f2298e27d.tar.gz
rust-19c07d382a666271a87e4df41db1bc3f2298e27d.zip
Rollup merge of #49612 - tmccombs:stabilize-getpid, r=kennytm
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)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index b463a6d88fe..40bc84f4bc1 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()
 }