Skip to content

Commit

Permalink
Rollup merge of rust-lang#64982 - tmandry:beta-backport, r=tmandry
Browse files Browse the repository at this point in the history
[BETA] Backport changes

- update rtpSpawn's parameters type(It's prototype has been updated in libc) rust-lang#64818
- Fix div_duration() marked as stable by mistake rust-lang#64815
- Use https for curl when building for linux rust-lang#64786
- remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc rust-lang#64720

r? @ghost
  • Loading branch information
tmandry authored Oct 2, 2019
2 parents 845f486 + f36b555 commit 6d9465a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 310 deletions.
4 changes: 0 additions & 4 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ Stabilized APIs
- [`<*mut T>::cast`]
- [`Duration::as_secs_f32`]
- [`Duration::as_secs_f64`]
- [`Duration::div_duration_f32`]
- [`Duration::div_duration_f64`]
- [`Duration::div_f32`]
- [`Duration::div_f64`]
- [`Duration::from_secs_f32`]
Expand Down Expand Up @@ -100,8 +98,6 @@ Compatibility Notes
[`<*mut T>::cast`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.cast
[`Duration::as_secs_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_secs_f32
[`Duration::as_secs_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_secs_f64
[`Duration::div_duration_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_duration_f32
[`Duration::div_duration_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_duration_f64
[`Duration::div_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_f32
[`Duration::div_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_f64
[`Duration::from_secs_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.from_secs_f32
Expand Down
6 changes: 4 additions & 2 deletions src/ci/docker/dist-x86_64-linux/build-curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
set -ex
source shared.sh

VERSION=7.51.0
VERSION=7.66.0

curl http://cool.haxx.se/download/curl-$VERSION.tar.bz2 | tar xjf -
curl https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/curl-$VERSION.tar.xz \
| xz --decompress \
| tar xf -

mkdir curl-build
cd curl-build
Expand Down
1 change: 0 additions & 1 deletion src/libstd/sys/vxworks/process/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ pub use crate::ffi::OsString as EnvKey;
mod process_common;
#[path = "process_vxworks.rs"]
mod process_inner;
mod rtp;
9 changes: 4 additions & 5 deletions src/libstd/sys/vxworks/process/process_vxworks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use libc::{self, c_int, c_char};
use libc::{RTP_ID};
use crate::sys;
use crate::sys::cvt;
use crate::sys::process::rtp;
use crate::sys::process::process_common::*;
use crate::sys_common::thread;

Expand Down Expand Up @@ -53,10 +52,10 @@ impl Command {
t!(cvt(libc::chdir(cwd.as_ptr())));
}

let ret = rtp::rtpSpawn(
let ret = libc::rtpSpawn(
self.get_argv()[0], // executing program
self.get_argv().as_ptr() as *const _, // argv
*sys::os::environ() as *const *const c_char,
self.get_argv().as_ptr() as *mut *const c_char, // argv
*sys::os::environ() as *mut *const c_char,
100 as c_int, // initial priority
thread::min_stack(), // initial stack size.
0, // options
Expand All @@ -78,7 +77,7 @@ impl Command {
libc::close(orig_stderr);
}

if ret != rtp::RTP_ID_ERROR {
if ret != libc::RTP_ID_ERROR {
p.pid = ret;
Ok((p, ours))
} else {
Expand Down
298 changes: 0 additions & 298 deletions src/libstd/sys/vxworks/process/rtp.rs

This file was deleted.

0 comments on commit 6d9465a

Please sign in to comment.