Merge pull request #311 from nhynes/compile-wasm

windelbouwman · web-flow · commit 7032de96d77b · 2019-02-23T10:42:09.000+01:00
Allow compiling VM for wasm32-unknown-unknown
diff --git a/src/main.rs b/src/main.rs
@@ -148,12 +148,12 @@ fn shell_exec(
     }
 }
 
-#[cfg(not(target_family = "unix"))]
+#[cfg(not(unix))]
 fn get_history_path() -> PathBuf {
     PathBuf::from(".repl_history.txt")
 }
 
-#[cfg(target_family = "unix")]
+#[cfg(unix)]
 fn get_history_path() -> PathBuf {
     //work around for windows dependent builds. The xdg crate is unix specific
     //so access to the BaseDirectories struct breaks builds on python.
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -15,28 +15,28 @@ use crate::obj::objstr;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 
-#[cfg(target_family = "unix")]
+#[cfg(unix)]
 pub fn raw_file_number(handle: File) -> i64 {
     use std::os::unix::io::IntoRawFd;
 
     i64::from(handle.into_raw_fd())
 }
 
-#[cfg(target_family = "unix")]
+#[cfg(unix)]
 pub fn rust_file(raw_fileno: i64) -> File {
     use std::os::unix::io::FromRawFd;
 
     unsafe { File::from_raw_fd(raw_fileno as i32) }
 }
 
-#[cfg(target_family = "windows")]
+#[cfg(windows)]
 pub fn raw_file_number(handle: File) -> i64 {
     use std::os::windows::io::IntoRawHandle;
 
     handle.into_raw_handle() as i64
 }
 
-#[cfg(target_family = "windows")]
+#[cfg(windows)]
 pub fn rust_file(raw_fileno: i64) -> File {
     use std::ffi::c_void;
     use std::os::windows::io::FromRawHandle;
@@ -45,6 +45,16 @@ pub fn rust_file(raw_fileno: i64) -> File {
     unsafe { File::from_raw_handle(raw_fileno as *mut c_void) }
 }
 
+#[cfg(all(not(unix), not(windows)))]
+pub fn rust_file(raw_fileno: i64) -> File {
+    unimplemented!();
+}
+
+#[cfg(all(not(unix), not(windows)))]
+pub fn raw_file_number(handle: File) -> i64 {
+    unimplemented!();
+}
+
 pub fn os_close(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(fileno, Some(vm.ctx.int_type()))]);
 

Original file line number	Diff line number	Diff line change
`@@ -148,12 +148,12 @@ fn shell_exec(`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`		`-#[cfg(not(target_family = "unix"))]`
	`151`	`+#[cfg(not(unix))]`
`152`	`152`	`fn get_history_path() -> PathBuf {`
`153`	`153`	`PathBuf::from(".repl_history.txt")`
`154`	`154`	`}`
`155`	`155`
`156`		`-#[cfg(target_family = "unix")]`
	`156`	`+#[cfg(unix)]`
`157`	`157`	`fn get_history_path() -> PathBuf {`
`158`	`158`	`//work around for windows dependent builds. The xdg crate is unix specific`
`159`	`159`	`//so access to the BaseDirectories struct breaks builds on python.`