ec7a50d20d
This commit is an implementation of [RFC 494][rfc] which removes the entire `std::c_vec` module and redesigns the `std::c_str` module as `std::ffi`. [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0494-c_str-and-c_vec-stability.md The interface of the new `CString` is outlined in the linked RFC, the primary changes being: * The `ToCStr` trait is gone, meaning the `with_c_str` and `to_c_str` methods are now gone. These two methods are replaced with a `CString::from_slice` method. * The `CString` type is now just a wrapper around `Vec<u8>` with a static guarantee that there is a trailing nul byte with no internal nul bytes. This means that `CString` now implements `Deref<Target = [c_char]>`, which is where it gains most of its methods from. A few helper methods are added to acquire a slice of `u8` instead of `c_char`, as well as including a slice with the trailing nul byte if necessary. * All usage of non-owned `CString` values is now done via two functions inside of `std::ffi`, called `c_str_to_bytes` and `c_str_to_bytes_with_nul`. These functions are now the one method used to convert a `*const c_char` to a Rust slice of `u8`. Many more details, including newly deprecated methods, can be found linked in the RFC. This is a: [breaking-change] Closes #20444
109 lines
2.6 KiB
Rust
109 lines
2.6 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![allow(missing_docs)]
|
|
#![allow(dead_code)]
|
|
|
|
use io::{self, IoError, IoResult};
|
|
use prelude::v1::*;
|
|
use sys::{last_error, retry};
|
|
use ffi::CString;
|
|
use num::Int;
|
|
use path::BytesContainer;
|
|
use collections;
|
|
|
|
pub mod backtrace;
|
|
pub mod condvar;
|
|
pub mod helper_thread;
|
|
pub mod mutex;
|
|
pub mod net;
|
|
pub mod rwlock;
|
|
pub mod stack;
|
|
pub mod thread;
|
|
pub mod thread_info;
|
|
pub mod thread_local;
|
|
|
|
// common error constructors
|
|
|
|
pub fn eof() -> IoError {
|
|
IoError {
|
|
kind: io::EndOfFile,
|
|
desc: "end of file",
|
|
detail: None,
|
|
}
|
|
}
|
|
|
|
pub fn timeout(desc: &'static str) -> IoError {
|
|
IoError {
|
|
kind: io::TimedOut,
|
|
desc: desc,
|
|
detail: None,
|
|
}
|
|
}
|
|
|
|
pub fn short_write(n: uint, desc: &'static str) -> IoError {
|
|
IoError {
|
|
kind: if n == 0 { io::TimedOut } else { io::ShortWrite(n) },
|
|
desc: desc,
|
|
detail: None,
|
|
}
|
|
}
|
|
|
|
pub fn unimpl() -> IoError {
|
|
IoError {
|
|
kind: io::IoUnavailable,
|
|
desc: "operations not yet supported",
|
|
detail: None,
|
|
}
|
|
}
|
|
|
|
// unix has nonzero values as errors
|
|
pub fn mkerr_libc<T: Int>(ret: T) -> IoResult<()> {
|
|
if ret != Int::zero() {
|
|
Err(last_error())
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
pub fn keep_going<F>(data: &[u8], mut f: F) -> i64 where
|
|
F: FnMut(*const u8, uint) -> i64,
|
|
{
|
|
let origamt = data.len();
|
|
let mut data = data.as_ptr();
|
|
let mut amt = origamt;
|
|
while amt > 0 {
|
|
let ret = retry(|| f(data, amt));
|
|
if ret == 0 {
|
|
break
|
|
} else if ret != -1 {
|
|
amt -= ret as uint;
|
|
data = unsafe { data.offset(ret as int) };
|
|
} else {
|
|
return ret;
|
|
}
|
|
}
|
|
return (origamt - amt) as i64;
|
|
}
|
|
|
|
// A trait for extracting representations from std::io types
|
|
pub trait AsInner<Inner> {
|
|
fn as_inner(&self) -> &Inner;
|
|
}
|
|
|
|
pub trait ProcessConfig<K: BytesContainer, V: BytesContainer> {
|
|
fn program(&self) -> &CString;
|
|
fn args(&self) -> &[CString];
|
|
fn env(&self) -> Option<&collections::HashMap<K, V>>;
|
|
fn cwd(&self) -> Option<&CString>;
|
|
fn uid(&self) -> Option<uint>;
|
|
fn gid(&self) -> Option<uint>;
|
|
fn detach(&self) -> bool;
|
|
}
|