Skip to content

Commit

Permalink
Unrolled build for rust-lang#131163
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
rust-timer authored Oct 3, 2024
2 parents f7c8928 + 4b48d72 commit 94deaf6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions library/std/src/io/stdio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/attributes/rustc_confusables_std_cases.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@ fn main() {
//~^ HELP you might have meant to use `push_str`
String::new().append(""); //~ ERROR E0599
//~^ HELP you might have meant to use `push_str`
let mut buffer = String::new();
let stdin = std::io::stdin();
stdin.get_line(&mut buffer).unwrap(); //~ ERROR E0599
//~^ HELP you might have meant to use `read_line`
}
13 changes: 12 additions & 1 deletion tests/ui/attributes/rustc_confusables_std_cases.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,18 @@ help: you might have meant to use `push_str`
LL | String::new().push_str("");
| ~~~~~~~~

error: aborting due to 8 previous errors
error[E0599]: no method named `get_line` found for struct `Stdin` in the current scope
--> $DIR/rustc_confusables_std_cases.rs:28:11
|
LL | stdin.get_line(&mut buffer).unwrap();
| ^^^^^^^^ method not found in `Stdin`
|
help: you might have meant to use `read_line`
|
LL | stdin.read_line(&mut buffer).unwrap();
| ~~~~~~~~~

error: aborting due to 9 previous errors

Some errors have detailed explanations: E0308, E0599.
For more information about an error, try `rustc --explain E0308`.

0 comments on commit 94deaf6

Please sign in to comment.