File tree 10 files changed +4
-232
lines changed
10 files changed +4
-232
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ pub mod linux;
38
38
#[ cfg( all( not( dox) , target_os = "haiku" ) ) ] pub mod haiku;
39
39
#[ cfg( all( not( dox) , target_os = "ios" ) ) ] pub mod ios;
40
40
#[ cfg( all( not( dox) , target_os = "macos" ) ) ] pub mod macos;
41
- #[ cfg( all( not( dox) , target_os = "nacl" ) ) ] pub mod nacl;
42
41
#[ cfg( all( not( dox) , target_os = "netbsd" ) ) ] pub mod netbsd;
43
42
#[ cfg( all( not( dox) , target_os = "openbsd" ) ) ] pub mod openbsd;
44
43
#[ cfg( all( not( dox) , target_os = "solaris" ) ) ] pub mod solaris;
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -118,27 +118,6 @@ pub mod os {
118
118
pub const EXE_EXTENSION : & ' static str = "" ;
119
119
}
120
120
121
- #[ cfg( all( target_os = "nacl" , not( target_arch = "le32" ) ) ) ]
122
- pub mod os {
123
- pub const FAMILY : & ' static str = "unix" ;
124
- pub const OS : & ' static str = "nacl" ;
125
- pub const DLL_PREFIX : & ' static str = "lib" ;
126
- pub const DLL_SUFFIX : & ' static str = ".so" ;
127
- pub const DLL_EXTENSION : & ' static str = "so" ;
128
- pub const EXE_SUFFIX : & ' static str = ".nexe" ;
129
- pub const EXE_EXTENSION : & ' static str = "nexe" ;
130
- }
131
- #[ cfg( all( target_os = "nacl" , target_arch = "le32" ) ) ]
132
- pub mod os {
133
- pub const FAMILY : & ' static str = "unix" ;
134
- pub const OS : & ' static str = "pnacl" ;
135
- pub const DLL_PREFIX : & ' static str = "lib" ;
136
- pub const DLL_SUFFIX : & ' static str = ".pso" ;
137
- pub const DLL_EXTENSION : & ' static str = "pso" ;
138
- pub const EXE_SUFFIX : & ' static str = ".pexe" ;
139
- pub const EXE_EXTENSION : & ' static str = "pexe" ;
140
- }
141
-
142
121
#[ cfg( target_os = "haiku" ) ]
143
122
pub mod os {
144
123
pub const FAMILY : & ' static str = "unix" ;
Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ use libc;
22
22
#[ cfg( all( not( dox) , target_os = "haiku" ) ) ] pub use os:: haiku as platform;
23
23
#[ cfg( all( not( dox) , target_os = "ios" ) ) ] pub use os:: ios as platform;
24
24
#[ cfg( all( not( dox) , target_os = "macos" ) ) ] pub use os:: macos as platform;
25
- #[ cfg( all( not( dox) , target_os = "nacl" ) ) ] pub use os:: nacl as platform;
26
25
#[ cfg( all( not( dox) , target_os = "netbsd" ) ) ] pub use os:: netbsd as platform;
27
26
#[ cfg( all( not( dox) , target_os = "openbsd" ) ) ] pub use os:: openbsd as platform;
28
27
#[ cfg( all( not( dox) , target_os = "solaris" ) ) ] pub use os:: solaris as platform;
@@ -77,11 +76,11 @@ pub fn init() {
77
76
reset_sigpipe ( ) ;
78
77
}
79
78
80
- #[ cfg( not( any( target_os = "nacl" , target_os = " emscripten", target_os="fuchsia" ) ) ) ]
79
+ #[ cfg( not( any( target_os = "emscripten" , target_os="fuchsia" ) ) ) ]
81
80
unsafe fn reset_sigpipe ( ) {
82
81
assert ! ( signal( libc:: SIGPIPE , libc:: SIG_IGN ) != libc:: SIG_ERR ) ;
83
82
}
84
- #[ cfg( any( target_os = "nacl" , target_os = " emscripten", target_os="fuchsia" ) ) ]
83
+ #[ cfg( any( target_os = "emscripten" , target_os="fuchsia" ) ) ]
85
84
unsafe fn reset_sigpipe ( ) { }
86
85
}
87
86
Original file line number Diff line number Diff line change @@ -483,12 +483,10 @@ pub fn home_dir() -> Option<PathBuf> {
483
483
484
484
#[ cfg( any( target_os = "android" ,
485
485
target_os = "ios" ,
486
- target_os = "nacl" ,
487
486
target_os = "emscripten" ) ) ]
488
487
unsafe fn fallback ( ) -> Option < OsString > { None }
489
488
#[ cfg( not( any( target_os = "android" ,
490
489
target_os = "ios" ,
491
- target_os = "nacl" ,
492
490
target_os = "emscripten" ) ) ) ]
493
491
unsafe fn fallback ( ) -> Option < OsString > {
494
492
let amt = match libc:: sysconf ( libc:: _SC_GETPW_R_SIZE_MAX) {
Original file line number Diff line number Diff line change @@ -464,7 +464,6 @@ mod tests {
464
464
// test from being flaky we ignore it on macOS.
465
465
#[ test]
466
466
#[ cfg_attr( target_os = "macos" , ignore) ]
467
- #[ cfg_attr( target_os = "nacl" , ignore) ] // no signals on NaCl.
468
467
// When run under our current QEMU emulation test suite this test fails,
469
468
// although the reason isn't very clear as to why. For now this test is
470
469
// ignored there.
Original file line number Diff line number Diff line change @@ -184,8 +184,8 @@ impl Command {
184
184
* sys:: os:: environ ( ) = envp. as_ptr ( ) ;
185
185
}
186
186
187
- // NaCl has no signal support.
188
- #[ cfg( not( any( target_os = "nacl" , target_os = " emscripten") ) ) ]
187
+ // emscripten has no signal support.
188
+ #[ cfg( not( any( target_os = "emscripten" ) ) ) ]
189
189
{
190
190
use mem;
191
191
// Reset signal handling so the child process starts in a
Original file line number Diff line number Diff line change 8
8
// option. This file may not be copied, modified, or distributed
9
9
// except according to those terms.
10
10
11
- #![ cfg_attr( target_os = "nacl" , allow( dead_code) ) ]
12
-
13
11
/// Common code for printing the backtrace in the same way across the different
14
12
/// supported platforms.
15
13
You can’t perform that action at this time.
0 commit comments