Comment fix and use of i64 instead of i32

Author: rmliddle

vm/src/stdlib/io.rs

@@ -165,7 +165,7 @@ fn file_io_readinto(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let length = objint::get_value(&py_length.unwrap()).to_u64().unwrap();
 
     let file_no = file_io.get_attr("fileno").unwrap();
-    let raw_fd = objint::get_value(&file_no).to_i32().unwrap();
+    let raw_fd = objint::get_value(&file_no).to_i64().unwrap();
 
     //extract unix file descriptor.
     let handle = os::rust_file(raw_fd);
@@ -197,7 +197,7 @@ fn file_io_write(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     );
 
     let file_no = file_io.get_attr("fileno").unwrap();
-    let raw_fd = objint::get_value(&file_no).to_i32().unwrap();
+    let raw_fd = objint::get_value(&file_no).to_i64().unwrap();
 
     //unsafe block - creates file handle from the UNIX file descriptor
     //raw_fd is supported on UNIX only. This will need to be extended

vm/src/stdlib/os.rs

@@ -16,35 +16,35 @@ use super::super::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeP
 use super::super::vm::VirtualMachine;
 
 #[cfg(target_family = "unix")]
-pub fn raw_file_number(handle: File) -> i32 {
+pub fn raw_file_number(handle: File) -> i64 {
     use std::os::unix::io::IntoRawFd;
 
-    handle.into_raw_fd()
+    handle.into_raw_fd() as i64
 }
 
 #[cfg(target_family = "unix")]
-pub fn rust_file(raw_fileno: i32) -> File {
+pub fn rust_file(raw_fileno: i64) -> File {
     use std::os::unix::io::FromRawFd;
 
-    unsafe { File::from_raw_fd(raw_fileno) }
+    unsafe { File::from_raw_fd(raw_fileno as i32) }
 }
 
 #[cfg(target_family = "windows")]
-pub fn raw_file_number(handle: File) -> i32 {
+pub fn raw_file_number(handle: File) -> i64 {
     use std::os::windows::io::IntoRawHandle;
 
-    handle.into_raw_handle() as i32
+    handle.into_raw_handle() as i64
 }
 
 #[cfg(target_family = "windows")]
-pub fn rust_file(raw_fileno: i32) -> File {
+pub fn rust_file(raw_fileno: i64) -> File {
     use std::ffi::c_void;
     use std::os::windows::io::FromRawHandle;
 
     //TODO: This is untested and (very) unsafe handling or
-    //raw pointers - This should be patched as a matter of
-    //urgently patched by comparison to the cpython handling of
-    //the equivalent fileno fields for windows
+    //raw pointers - This should be patched urgently by 
+    //comparison to the cpython handling of the equivalent fileno 
+    //fields for windows
     unsafe { File::from_raw_handle(raw_fileno as *mut c_void) }
 }
 
@@ -56,7 +56,7 @@ pub fn os_close(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     //The File type automatically closes when it goes out of scope.
     //To enable us to close these file desciptors (and hence prevent leaks)
     //we seek to create the relevant File and simply let it pass out of scope!
-    rust_file(raw_fileno.to_i32().unwrap());
+    rust_file(raw_fileno.to_i64().unwrap());
 
     Ok(vm.get_none())
 }