From a7bbd7da4eb98127104fdfd415ad6c746f7e2a12 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Tue, 9 Jun 2015 21:39:36 -0700 Subject: Implement RFC 1014 Closes #25977 The various `stdfoo_raw` methods in std::io now return `io::Result`s, since they may not exist on Windows. They will always return `Ok` on Unix-like platforms. [breaking-change] --- src/test/run-pass/rfc-1014-2.rs | 32 ++++++++++++++++++++++++++++++++ src/test/run-pass/rfc-1014.rs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 src/test/run-pass/rfc-1014-2.rs create mode 100644 src/test/run-pass/rfc-1014.rs (limited to 'src/test') diff --git a/src/test/run-pass/rfc-1014-2.rs b/src/test/run-pass/rfc-1014-2.rs new file mode 100644 index 00000000000..ad76daaace4 --- /dev/null +++ b/src/test/run-pass/rfc-1014-2.rs @@ -0,0 +1,32 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. +#![feature(libc)] + +extern crate libc; + +#[cfg(windows)] +extern "system" { + fn SetStdHandle(nStdHandle: libc::DWORD, nHandle: libc::HANDLE) -> libc::BOOL; +} + +#[cfg(windows)] +fn close_stdout() { + const STD_OUTPUT_HANDLE: libc::DWORD = -11i32 as libc::DWORD; + unsafe { SetStdHandle(STD_OUTPUT_HANDLE, 0 as libc::HANDLE); } +} + +#[cfg(windows)] +fn main() { + close_stdout(); + println!("hello world"); +} + +#[cfg(not(windows))] +fn main() {} diff --git a/src/test/run-pass/rfc-1014.rs b/src/test/run-pass/rfc-1014.rs new file mode 100644 index 00000000000..98cad4efab7 --- /dev/null +++ b/src/test/run-pass/rfc-1014.rs @@ -0,0 +1,33 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. +#![feature(libc)] + +extern crate libc; + +#[cfg(windows)] +extern "system" { + pub fn GetStdHandle(which: libc::DWORD) -> libc::HANDLE; +} + +#[cfg(windows)] +fn close_stdout() { + const STD_OUTPUT_HANDLE: libc::DWORD = -11i32 as libc::DWORD; + unsafe { libc::CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); } +} + +#[cfg(not(windows))] +fn close_stdout() { + unsafe { libc::close(libc::STDOUT_FILENO); } +} + +fn main() { + close_stdout(); + println!("hello world"); +} -- cgit 1.4.1-3-g733a5