about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-15 06:44:42 +0000
committerbors <bors@rust-lang.org>2015-06-15 06:44:42 +0000
commit7517ecf4fc9cfe2adff8a38ecc2ef660692a4b5b (patch)
treee1b6cb4d5c0cb9ae19e099fcdb968e1ea4d0e739 /src/test
parenta54a80921971791b1148b7633cb43029f7d2ef9b (diff)
parenta7bbd7da4eb98127104fdfd415ad6c746f7e2a12 (diff)
downloadrust-7517ecf4fc9cfe2adff8a38ecc2ef660692a4b5b.tar.gz
rust-7517ecf4fc9cfe2adff8a38ecc2ef660692a4b5b.zip
Auto merge of #26168 - sfackler:stdout-panic, r=alexcrichton
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]
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/rfc-1014-2.rs32
-rw-r--r--src/test/run-pass/rfc-1014.rs33
2 files changed, 65 insertions, 0 deletions
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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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");
+}