diff options
| author | bors <bors@rust-lang.org> | 2024-10-03 14:15:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-03 14:15:06 +0000 |
| commit | 1e5719bdc40bb553089ce83525f07dfe0b2e71e9 (patch) | |
| tree | e150d211c625a23d9b336f0ac7a21d0cce550141 /library/std/src | |
| parent | f7c8928f035370be33463bb7f1cd1aeca2c5f898 (diff) | |
| parent | 35ff9e2bc6b7f773cad09d0be6427d7ce318d637 (diff) | |
| download | rust-1e5719bdc40bb553089ce83525f07dfe0b2e71e9.tar.gz rust-1e5719bdc40bb553089ce83525f07dfe0b2e71e9.zip | |
Auto merge of #131196 - matthiaskrgr:rollup-3it3zqp, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #130419 (Streamline `HirCollector`) - #131163 (Add `get_line` confusable to `Stdin::read_line()`) - #131173 (Fix `target_abi` in SOLID targets) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/io/stdio.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/io/stdio.rs b/library/std/src/io/stdio.rs index 6de069a518e..bf242e715bd 100644 --- a/library/std/src/io/stdio.rs +++ b/library/std/src/io/stdio.rs @@ -394,6 +394,7 @@ impl Stdin { /// in which case it will wait for the Enter key to be pressed before /// continuing #[stable(feature = "rust1", since = "1.0.0")] + #[rustc_confusables("get_line")] pub fn read_line(&self, buf: &mut String) -> io::Result<usize> { self.lock().read_line(buf) } |
