File tree Expand file tree Collapse file tree 10 files changed +4
-232
lines changed Expand file tree Collapse file tree 10 files changed +4
-232
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ pub mod linux;
3838#[ cfg( all( not( dox) , target_os = "haiku" ) ) ] pub mod haiku;
3939#[ cfg( all( not( dox) , target_os = "ios" ) ) ] pub mod ios;
4040#[ cfg( all( not( dox) , target_os = "macos" ) ) ] pub mod macos;
41- #[ cfg( all( not( dox) , target_os = "nacl" ) ) ] pub mod nacl;
4241#[ cfg( all( not( dox) , target_os = "netbsd" ) ) ] pub mod netbsd;
4342#[ cfg( all( not( dox) , target_os = "openbsd" ) ) ] pub mod openbsd;
4443#[ 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 {
118118 pub const EXE_EXTENSION : & ' static str = "" ;
119119}
120120
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-
142121#[ cfg( target_os = "haiku" ) ]
143122pub mod os {
144123 pub const FAMILY : & ' static str = "unix" ;
Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ use libc;
2222#[ cfg( all( not( dox) , target_os = "haiku" ) ) ] pub use os:: haiku as platform;
2323#[ cfg( all( not( dox) , target_os = "ios" ) ) ] pub use os:: ios as platform;
2424#[ 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;
2625#[ cfg( all( not( dox) , target_os = "netbsd" ) ) ] pub use os:: netbsd as platform;
2726#[ cfg( all( not( dox) , target_os = "openbsd" ) ) ] pub use os:: openbsd as platform;
2827#[ cfg( all( not( dox) , target_os = "solaris" ) ) ] pub use os:: solaris as platform;
@@ -77,11 +76,11 @@ pub fn init() {
7776 reset_sigpipe ( ) ;
7877 }
7978
80- #[ cfg( not( any( target_os = "nacl" , target_os = " emscripten", target_os="fuchsia" ) ) ) ]
79+ #[ cfg( not( any( target_os = "emscripten" , target_os="fuchsia" ) ) ) ]
8180 unsafe fn reset_sigpipe ( ) {
8281 assert ! ( signal( libc:: SIGPIPE , libc:: SIG_IGN ) != libc:: SIG_ERR ) ;
8382 }
84- #[ cfg( any( target_os = "nacl" , target_os = " emscripten", target_os="fuchsia" ) ) ]
83+ #[ cfg( any( target_os = "emscripten" , target_os="fuchsia" ) ) ]
8584 unsafe fn reset_sigpipe ( ) { }
8685}
8786
Original file line number Diff line number Diff line change @@ -483,12 +483,10 @@ pub fn home_dir() -> Option<PathBuf> {
483483
484484 #[ cfg( any( target_os = "android" ,
485485 target_os = "ios" ,
486- target_os = "nacl" ,
487486 target_os = "emscripten" ) ) ]
488487 unsafe fn fallback ( ) -> Option < OsString > { None }
489488 #[ cfg( not( any( target_os = "android" ,
490489 target_os = "ios" ,
491- target_os = "nacl" ,
492490 target_os = "emscripten" ) ) ) ]
493491 unsafe fn fallback ( ) -> Option < OsString > {
494492 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 {
464464 // test from being flaky we ignore it on macOS.
465465 #[ test]
466466 #[ cfg_attr( target_os = "macos" , ignore) ]
467- #[ cfg_attr( target_os = "nacl" , ignore) ] // no signals on NaCl.
468467 // When run under our current QEMU emulation test suite this test fails,
469468 // although the reason isn't very clear as to why. For now this test is
470469 // ignored there.
Original file line number Diff line number Diff line change @@ -184,8 +184,8 @@ impl Command {
184184 * sys:: os:: environ ( ) = envp. as_ptr ( ) ;
185185 }
186186
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" ) ) ) ]
189189 {
190190 use mem;
191191 // Reset signal handling so the child process starts in a
Original file line number Diff line number Diff line change 88// option. This file may not be copied, modified, or distributed
99// except according to those terms.
1010
11- #![ cfg_attr( target_os = "nacl" , allow( dead_code) ) ]
12-
1311/// Common code for printing the backtrace in the same way across the different
1412/// supported platforms.
1513
You can’t perform that action at this time.
0 commit comments