diff --git a/library/std/src/io/stdio.rs b/library/std/src/io/stdio.rs index f91264af531d5..c68d598080087 100644 --- a/library/std/src/io/stdio.rs +++ b/library/std/src/io/stdio.rs @@ -50,7 +50,8 @@ struct StderrRaw(stdio::Stderr); /// handles is **not** available to raw handles returned from this function. /// /// The returned handle has no external synchronization or buffering. -fn stdin_raw() -> StdinRaw { +#[unstable(feature = "libstd_sys_internals", issue = "none")] +const fn stdin_raw() -> StdinRaw { StdinRaw(stdio::Stdin::new()) } @@ -63,7 +64,8 @@ fn stdin_raw() -> StdinRaw { /// /// The returned handle has no external synchronization or buffering layered on /// top. -fn stdout_raw() -> StdoutRaw { +#[unstable(feature = "libstd_sys_internals", issue = "none")] +const fn stdout_raw() -> StdoutRaw { StdoutRaw(stdio::Stdout::new()) } @@ -74,7 +76,8 @@ fn stdout_raw() -> StdoutRaw { /// /// The returned handle has no external synchronization or buffering layered on /// top. -fn stderr_raw() -> StderrRaw { +#[unstable(feature = "libstd_sys_internals", issue = "none")] +const fn stderr_raw() -> StderrRaw { StderrRaw(stdio::Stderr::new()) } diff --git a/library/std/src/sys/cloudabi/stdio.rs b/library/std/src/sys/cloudabi/stdio.rs index d564f4f7f40b2..7fec4731a462c 100644 --- a/library/std/src/sys/cloudabi/stdio.rs +++ b/library/std/src/sys/cloudabi/stdio.rs @@ -6,7 +6,7 @@ pub struct Stdout(()); pub struct Stderr(()); impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin(()) } } @@ -18,7 +18,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout(()) } } @@ -37,7 +37,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr(()) } } diff --git a/library/std/src/sys/hermit/stdio.rs b/library/std/src/sys/hermit/stdio.rs index 359ea13c2befc..82304dd6dc293 100644 --- a/library/std/src/sys/hermit/stdio.rs +++ b/library/std/src/sys/hermit/stdio.rs @@ -7,7 +7,7 @@ pub struct Stdout; pub struct Stderr; impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin } } @@ -28,7 +28,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout } } @@ -69,7 +69,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr } } diff --git a/library/std/src/sys/sgx/stdio.rs b/library/std/src/sys/sgx/stdio.rs index d771a39ea851e..49f44f9f498ac 100644 --- a/library/std/src/sys/sgx/stdio.rs +++ b/library/std/src/sys/sgx/stdio.rs @@ -19,7 +19,7 @@ fn with_std_fd R, R>(fd: abi::Fd, f: F) -> R { } impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin(()) } } @@ -31,7 +31,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout(()) } } @@ -47,7 +47,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr(()) } } diff --git a/library/std/src/sys/unix/stdio.rs b/library/std/src/sys/unix/stdio.rs index bbf5dd65fa5d9..a05fe8165cff2 100644 --- a/library/std/src/sys/unix/stdio.rs +++ b/library/std/src/sys/unix/stdio.rs @@ -7,7 +7,7 @@ pub struct Stdout(()); pub struct Stderr(()); impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin(()) } } @@ -28,7 +28,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout(()) } } @@ -53,7 +53,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr(()) } } diff --git a/library/std/src/sys/unsupported/stdio.rs b/library/std/src/sys/unsupported/stdio.rs index 7e60e0712dd9d..b5e3f5be9885b 100644 --- a/library/std/src/sys/unsupported/stdio.rs +++ b/library/std/src/sys/unsupported/stdio.rs @@ -5,7 +5,7 @@ pub struct Stdout; pub struct Stderr; impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin } } @@ -17,7 +17,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout } } @@ -33,7 +33,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr } } diff --git a/library/std/src/sys/vxworks/stdio.rs b/library/std/src/sys/vxworks/stdio.rs index e99d2d583467e..92e9f205b4e6e 100644 --- a/library/std/src/sys/vxworks/stdio.rs +++ b/library/std/src/sys/vxworks/stdio.rs @@ -6,7 +6,7 @@ pub struct Stdout(()); pub struct Stderr(()); impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin(()) } } @@ -21,7 +21,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout(()) } } @@ -40,7 +40,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr(()) } } diff --git a/library/std/src/sys/wasi/stdio.rs b/library/std/src/sys/wasi/stdio.rs index cc27e2ee5833c..23baafabf7933 100644 --- a/library/std/src/sys/wasi/stdio.rs +++ b/library/std/src/sys/wasi/stdio.rs @@ -7,7 +7,7 @@ pub struct Stdout; pub struct Stderr; impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin } @@ -33,7 +33,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout } @@ -62,7 +62,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr } diff --git a/library/std/src/sys/windows/stdio.rs b/library/std/src/sys/windows/stdio.rs index b2e5458c0d222..ff214497166be 100644 --- a/library/std/src/sys/windows/stdio.rs +++ b/library/std/src/sys/windows/stdio.rs @@ -131,7 +131,7 @@ fn write_u16s(handle: c::HANDLE, data: &[u16]) -> io::Result { } impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin { surrogate: 0 } } } @@ -255,7 +255,7 @@ fn utf16_to_utf8(utf16: &[u16], utf8: &mut [u8]) -> io::Result { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout } } @@ -271,7 +271,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr } } diff --git a/library/std/src/sys/windows/stdio_uwp.rs b/library/std/src/sys/windows/stdio_uwp.rs index 0016f5dcd0112..872511af862a7 100644 --- a/library/std/src/sys/windows/stdio_uwp.rs +++ b/library/std/src/sys/windows/stdio_uwp.rs @@ -30,7 +30,7 @@ fn write(handle_id: c::DWORD, data: &[u8]) -> io::Result { } impl Stdin { - pub fn new() -> Stdin { + pub const fn new() -> Stdin { Stdin {} } } @@ -44,7 +44,7 @@ impl io::Read for Stdin { } impl Stdout { - pub fn new() -> Stdout { + pub const fn new() -> Stdout { Stdout } } @@ -60,7 +60,7 @@ impl io::Write for Stdout { } impl Stderr { - pub fn new() -> Stderr { + pub const fn new() -> Stderr { Stderr } }