diff options
| author | bors <bors@rust-lang.org> | 2015-12-25 06:24:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-25 06:24:56 +0000 |
| commit | 711f11e8d607b3ecf297366fa704b5200709d12d (patch) | |
| tree | 60066a3f39833f08c3e57def13c92a02f1e9c6fa /src/libstd | |
| parent | 8037e62d29f7e0f7084c95b87c243dc83bdd8e3c (diff) | |
| parent | 944b337c9559db56b26f2a06fff65bf6ea8eb5a6 (diff) | |
| download | rust-711f11e8d607b3ecf297366fa704b5200709d12d.tar.gz rust-711f11e8d607b3ecf297366fa704b5200709d12d.zip | |
Auto merge of #30544 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30251, #30461, #30465, #30473, #30529, #30537, #30539, #30541, #30543 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/dynamic_lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 62ec23ccb20..4d805e17a76 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -16,7 +16,7 @@ reason = "API has not been scrutinized and is highly likely to \ either disappear or change", issue = "27810")] -#![rustc_deprecated(since = "1.5.0", reason = "replaced with crates.io crates")] +#![rustc_deprecated(since = "1.5.0", reason = "replaced with 'dylib' on crates.io")] #![allow(missing_docs)] #![allow(deprecated)] diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 985dbdd895f..120e56d8079 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -252,7 +252,7 @@ impl Stdin { /// /// - Pipe some text to it, e.g. `printf foo | path/to/executable` /// - Give it text interactively by running the executable directly, - // in which case it will wait for the Enter key to be pressed before + /// in which case it will wait for the Enter key to be pressed before /// continuing #[stable(feature = "rust1", since = "1.0.0")] pub fn read_line(&self, buf: &mut String) -> io::Result<usize> { |