Skip to content

Commit

Permalink
Fix up stability annotations per feedback.
Browse files Browse the repository at this point in the history
  • Loading branch information
zackw committed May 10, 2017
1 parent 07766f6 commit 4ab3bcb
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 31 deletions.
4 changes: 1 addition & 3 deletions src/doc/unstable-book/src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
- [derive_eq](library-features/derive-eq.md)
- [discriminant_value](library-features/discriminant-value.md)
- [error_type_id](library-features/error-type-id.md)
- [eprint](library-features/eprint.md)
- [eprint_internal](library-features/eprint-internal.md)
- [exact_size_is_empty](library-features/exact-size-is-empty.md)
- [fd](library-features/fd.md)
- [fd_read](library-features/fd-read.md)
Expand Down Expand Up @@ -180,7 +178,7 @@
- [peek](library-features/peek.md)
- [placement_in](library-features/placement-in.md)
- [placement_new_protocol](library-features/placement-new-protocol.md)
- [print](library-features/print.md)
- [print_internals](library-features/print-internals.md)
- [proc_macro_internals](library-features/proc-macro-internals.md)
- [process_try_wait](library-features/process-try-wait.md)
- [question_mark_carrier](library-features/question-mark-carrier.md)
Expand Down
13 changes: 0 additions & 13 deletions src/doc/unstable-book/src/library-features/eprint.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# `eprint_internal`
# `print_internals`

This feature is internal to the Rust compiler and is not intended for general use.

Expand Down
5 changes: 0 additions & 5 deletions src/doc/unstable-book/src/library-features/print.md

This file was deleted.

6 changes: 3 additions & 3 deletions src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,11 @@ pub use self::error::{Result, Error, ErrorKind};
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::util::{copy, sink, Sink, empty, Empty, repeat, Repeat};
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::stdio::{stdin, stdout, stderr, _print, Stdin, Stdout, Stderr};
pub use self::stdio::{stdin, stdout, stderr, Stdin, Stdout, Stderr};
#[stable(feature = "rust1", since = "1.0.0")]
pub use self::stdio::{StdoutLock, StderrLock, StdinLock};
#[unstable(feature = "eprint", issue="40528")]
pub use self::stdio::_eprint;
#[unstable(feature = "print_internals", issue = "0")]
pub use self::stdio::{_print, _eprint};
#[unstable(feature = "libstd_io_internals", issue = "0")]
#[doc(no_inline, hidden)]
pub use self::stdio::{set_panic, set_print};
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/io/stdio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -692,15 +692,15 @@ fn print_to<T>(args: fmt::Arguments,
}
}

#[unstable(feature = "print",
#[unstable(feature = "print_internals",
reason = "implementation detail which may disappear or be replaced at any time",
issue = "0")]
#[doc(hidden)]
pub fn _print(args: fmt::Arguments) {
print_to(args, &LOCAL_STDOUT, stdout, "stdout");
}

#[unstable(feature = "eprint_internal",
#[unstable(feature = "print_internals",
reason = "implementation detail which may disappear or be replaced at any time",
issue = "0")]
#[doc(hidden)]
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ macro_rules! println {
///
/// Panics if writing to `io::stderr` fails.
#[macro_export]
#[unstable(feature = "eprint", issue="40528")]
#[stable(feature = "eprint", since="1.18.0")]
#[allow_internal_unstable]
macro_rules! eprint {
($($arg:tt)*) => ($crate::io::_eprint(format_args!($($arg)*)));
Expand All @@ -162,7 +162,7 @@ macro_rules! eprint {
///
/// Panics if writing to `io::stderr` fails.
#[macro_export]
#[unstable(feature = "eprint", issue="40528")]
#[stable(feature = "eprint", since="1.18.0")]
macro_rules! eprintln {
() => (eprint!("\n"));
($fmt:expr) => (eprint!(concat!($fmt, "\n")));
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/print-stdout-eprint-stderr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(eprint)]

use std::{env, process};

fn child() {
Expand Down

0 comments on commit 4ab3bcb

Please sign in to comment.