Skip to content

Commit 48ab4cd

Browse files
borsbors
committed
Auto merge of #47268 - EdSchouten:cloudabi-libstd, r=alexcrichton
Implement libstd for CloudABI. Though CloudABI is strongly inspired by POSIX, its absence of features that don't work well with capability-based sandboxing makes it different enough that adding bits to `sys/unix` will make things a mess. This change therefore adds CloudABI specific platform code under `sys/cloudabi`. One of the goals of this implementation is to build as much as possible directly on top of CloudABI's system call layer, as opposed to using the C library. This is preferred, as the system call layer is supposed to be stable, whereas the C library ABI technically is not. An advantage of this approach is that it allows us to implement certain interfaces, such as mutexes and condition variables more optimally. They can be lighter than the ones provided by pthreads. This change disables some modules that cannot realistically be implemented right now. For example, libstd's pathname abstraction is not designed with POSIX `*at()` (e.g., `openat()`) in mind. The `*at()` functions are the only set of file system APIs available on CloudABI. There is no global file system namespace, nor a process working directory. Discussions on how to port these modules over are outside the scope of this change.
2 parents fd0f292 + 6a8d55a commit 48ab4cd

30 files changed

+5057
-14
lines changed

‎src/libstd/env.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,7 @@ mod arch {
956956
mod tests {
957957
use super::*;
958958

959-
use ffi::OsStr;
960-
use path::{Path, PathBuf};
959+
use path::Path;
961960

962961
#[test]
963962
#[cfg_attr(target_os = "emscripten", ignore)]
@@ -980,6 +979,8 @@ mod tests {
980979
#[test]
981980
#[cfg(windows)]
982981
fn split_paths_windows() {
982+
use path::PathBuf;
983+
983984
fn check_parse(unparsed: &str, parsed: &[&str]) -> bool {
984985
split_paths(unparsed).collect::<Vec<_>>() ==
985986
parsed.iter().map(|s| PathBuf::from(*s)).collect::<Vec<_>>()
@@ -1000,6 +1001,8 @@ mod tests {
10001001
#[test]
10011002
#[cfg(unix)]
10021003
fn split_paths_unix() {
1004+
use path::PathBuf;
1005+
10031006
fn check_parse(unparsed: &str, parsed: &[&str]) -> bool {
10041007
split_paths(unparsed).collect::<Vec<_>>() ==
10051008
parsed.iter().map(|s| PathBuf::from(*s)).collect::<Vec<_>>()
@@ -1015,6 +1018,8 @@ mod tests {
10151018
#[test]
10161019
#[cfg(unix)]
10171020
fn join_paths_unix() {
1021+
use ffi::OsStr;
1022+
10181023
fn test_eq(input: &[&str], output: &str) -> bool {
10191024
&*join_paths(input.iter().cloned()).unwrap() ==
10201025
OsStr::new(output)
@@ -1031,6 +1036,8 @@ mod tests {
10311036
#[test]
10321037
#[cfg(windows)]
10331038
fn join_paths_windows() {
1039+
use ffi::OsStr;
1040+
10341041
fn test_eq(input: &[&str], output: &str) -> bool {
10351042
&*join_paths(input.iter().cloned()).unwrap() ==
10361043
OsStr::new(output)

‎src/libstd/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ impl AsInnerMut<fs_imp::DirBuilder> for DirBuilder {
19891989
}
19901990
}
19911991

1992-
#[cfg(all(test, not(target_os = "emscripten")))]
1992+
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))]
19931993
mod tests {
19941994
use io::prelude::*;
19951995

‎src/libstd/net/tcp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ impl fmt::Debug for TcpListener {
885885
}
886886
}
887887

888-
#[cfg(all(test, not(target_os = "emscripten")))]
888+
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))]
889889
mod tests {
890890
use io::ErrorKind;
891891
use io::prelude::*;

‎src/libstd/net/udp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ impl fmt::Debug for UdpSocket {
786786
}
787787
}
788788

789-
#[cfg(all(test, not(target_os = "emscripten")))]
789+
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))]
790790
mod tests {
791791
use io::ErrorKind;
792792
use net::*;

‎src/libstd/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ pub fn id() -> u32 {
13921392
::sys::os::getpid()
13931393
}
13941394

1395-
#[cfg(all(test, not(target_os = "emscripten")))]
1395+
#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))]
13961396
mod tests {
13971397
use io::prelude::*;
13981398

‎src/libstd/sys/cloudabi/abi/bitflags.rs

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright (c) 2018 Nuxi (https://nuxi.nl/) and contributors.
2+
//
3+
// Redistribution and use in source and binary forms, with or without
4+
// modification, are permitted provided that the following conditions
5+
// are met:
6+
// 1. Redistributions of source code must retain the above copyright
7+
// notice, this list of conditions and the following disclaimer.
8+
// 2. Redistributions in binary form must reproduce the above copyright
9+
// notice, this list of conditions and the following disclaimer in the
10+
// documentation and/or other materials provided with the distribution.
11+
//
12+
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
13+
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
14+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
15+
// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
16+
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
17+
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
18+
// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
19+
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
20+
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
21+
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
22+
// SUCH DAMAGE.
23+
24+
// Appease Rust's tidy.
25+
// ignore-license
26+
27+
#[cfg(feature = "bitflags")]
28+
#[macro_use]
29+
extern crate bitflags;
30+
31+
// Minimal implementation of bitflags! in case we can't depend on the bitflags
32+
// crate. Only implements `bits()` and a `from_bits_truncate()` that doesn't
33+
// actually truncate.
34+
#[cfg(not(feature = "bitflags"))]
35+
macro_rules! bitflags {
36+
(
37+
$(#[$attr:meta])*
38+
pub struct $name:ident: $type:ty {
39+
$($(#[$const_attr:meta])* const $const:ident = $val:expr;)*
40+
}
41+
) => {
42+
$(#[$attr])*
43+
#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
44+
pub struct $name { bits: $type }
45+
impl $name {
46+
$($(#[$const_attr])* pub const $const: $name = $name{ bits: $val };)*
47+
pub fn bits(&self) -> $type { self.bits }
48+
pub fn from_bits_truncate(bits: $type) -> Self { $name{ bits } }
49+
}
50+
}
51+
}

0 commit comments

Comments
 (0)