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
41 lines
1.2 KiB
Rust
41 lines
1.2 KiB
Rust
// Copyright 2012 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.
|
|
|
|
// ignore-fast doesn't like extern crate
|
|
|
|
extern crate libc;
|
|
|
|
use std::ffi::CString;
|
|
|
|
mod mlibc {
|
|
use libc::{c_char, c_long, c_longlong};
|
|
|
|
extern {
|
|
pub fn atol(x: *const c_char) -> c_long;
|
|
pub fn atoll(x: *const c_char) -> c_longlong;
|
|
}
|
|
}
|
|
|
|
fn atol(s: String) -> int {
|
|
let c = CString::from_slice(s.as_bytes());
|
|
unsafe { mlibc::atol(c.as_ptr()) as int }
|
|
}
|
|
|
|
fn atoll(s: String) -> i64 {
|
|
let c = CString::from_slice(s.as_bytes());
|
|
unsafe { mlibc::atoll(c.as_ptr()) as i64 }
|
|
}
|
|
|
|
pub fn main() {
|
|
assert_eq!(atol("1024".to_string()) * 10, atol("10240".to_string()));
|
|
assert!((atoll("11111111111111111".to_string()) * 10) ==
|
|
atoll("111111111111111110".to_string()));
|
|
}
|