Rollup merge of #131163 - JakenHerman:master, r=Nadrieril · qinheping/verify-rust-std@86fa474 (original) (raw)

Skip to content

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Commit 86fa474

Rollup merge of rust-lang#131163 - JakenHerman:master, r=Nadrieril

Add `get_line` confusable to `Stdin::read_line()` This pull request resolves rust-lang#131091--- I've updated tests for `tests/ui/attributes/rustc_confusables_std_cases` in order to verify this change is working as intended. Before I submitted this pull request, I had a pull request to my local fork. If you're interested in seeing the conversation on that PR, go to JakenHerman#1. --- **Testing**: Run `./x.py test tests/ui/attributes/rustc_confusables_std_cases.rs`

File tree

1 file changed

lines changed

1 file changed

lines changed

Original file line number Diff line number Diff line change
@@ -394,6 +394,7 @@ impl Stdin {
394 394 /// in which case it will wait for the Enter key to be pressed before
395 395 /// continuing
396 396 #[stable(feature = "rust1", since = "1.0.0")]
397 +#[rustc_confusables("get_line")]
397 398 pub fn read_line(&self, buf: &mut String) -> io::Result<usize> {
398 399 self.lock().read_line(buf)
399 400 }