nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 17:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #114143 - Enselic:rename-issue-100605, r=eholk

Browse Source 
Rename tests/ui/issues/issue-100605.rs to ../type/option-ref-advice.rs

The test is a regression test for a [bug ](https://github.com/rust-lang/rust/issues/100605) where the compiler gave bad advice for an `Option<&String>`. Rename the file appropriately.

Part of #73494
This commit is contained in:
bors 2023-08-05 15:53:07 +00:00
commit 9565b68b74
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/tidy/src/ui_tests.rs
View File

@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
const ENTRY_LIMIT: usize = 900; const ENTRY_LIMIT: usize = 900;
// FIXME: The following limits should be reduced eventually. // FIXME: The following limits should be reduced eventually.
const ISSUES_ENTRY_LIMIT: usize = 1893; const ISSUES_ENTRY_LIMIT: usize = 1891;
const ROOT_ENTRY_LIMIT: usize = 866; const ROOT_ENTRY_LIMIT: usize = 866;
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[ const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[

9
tests/ui/issues/issue-100605.rs
View File

@ -1,9 +0,0 @@
fn takes_option(_arg: Option<&String>) {}
fn main() {
takes_option(&None); //~ ERROR 4:18: 4:23: mismatched types [E0308]
let x = String::from("x");
let res = Some(x);
takes_option(&res); //~ ERROR 8:18: 8:22: mismatched types [E0308]
}

11
tests/ui/type/option-ref-advice.rs Normal file
View File

@ -0,0 +1,11 @@
// Regression test for https://github.com/rust-lang/rust/issues/100605
fn takes_option(_arg: Option<&String>) {}
fn main() {
takes_option(&None); //~ ERROR 6:18: 6:23: mismatched types [E0308]
let x = String::from("x");
let res = Some(x);
takes_option(&res); //~ ERROR 10:18: 10:22: mismatched types [E0308]
}

8
tests/ui/issues/issue-100605.stderr → tests/ui/type/option-ref-advice.stderr
View File

@ -1,5 +1,5 @@
error[E0308]: mismatched types error[E0308]: mismatched types
--> $DIR/issue-100605.rs:4:18 --> $DIR/option-ref-advice.rs:6:18
| |
LL | takes_option(&None); LL | takes_option(&None);
| ------------ ^^^^^ expected `Option<&String>`, found `&Option<_>` | ------------ ^^^^^ expected `Option<&String>`, found `&Option<_>`
@ -9,7 +9,7 @@ LL | takes_option(&None);
= note: expected enum `Option<&String>` = note: expected enum `Option<&String>`
found reference `&Option<_>` found reference `&Option<_>`
note: function defined here note: function defined here
--> $DIR/issue-100605.rs:1:4 --> $DIR/option-ref-advice.rs:3:4
| |
LL | fn takes_option(_arg: Option<&String>) {} LL | fn takes_option(_arg: Option<&String>) {}
| ^^^^^^^^^^^^ --------------------- | ^^^^^^^^^^^^ ---------------------
@ -20,7 +20,7 @@ LL + takes_option(None);
| |
error[E0308]: mismatched types error[E0308]: mismatched types
--> $DIR/issue-100605.rs:8:18 --> $DIR/option-ref-advice.rs:10:18
| |
LL | takes_option(&res); LL | takes_option(&res);
| ------------ ^^^^ expected `Option<&String>`, found `&Option<String>` | ------------ ^^^^ expected `Option<&String>`, found `&Option<String>`
@ -30,7 +30,7 @@ LL | takes_option(&res);
= note: expected enum `Option<&String>` = note: expected enum `Option<&String>`
found reference `&Option<String>` found reference `&Option<String>`
note: function defined here note: function defined here
--> $DIR/issue-100605.rs:1:4 --> $DIR/option-ref-advice.rs:3:4
| |
LL | fn takes_option(_arg: Option<&String>) {} LL | fn takes_option(_arg: Option<&String>) {}
| ^^^^^^^^^^^^ --------------------- | ^^^^^^^^^^^^ ---------------------