Skip to content

Fix problem noticed in PR106859 with char -> u8 suggestion #107709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2023
Merged

Fix problem noticed in PR106859 with char -> u8 suggestion #107709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
(ty::Uint(ty::UintTy::U8), ty::Char) => {
if let Ok(code) = self.tcx.sess().source_map().span_to_snippet(span)
&& let Some(code) = code.strip_prefix('\'').and_then(|s| s.strip_suffix('\''))
&& code.chars().next().map_or(false, |c| c.is_ascii())
&& !code.starts_with("\\u") // forbid all Unicode escapes
&& code.chars().next().map_or(false, |c| c.is_ascii()) // forbids literal Unicode characters beyond ASCII
{
err.span_suggestion(
span,
Expand Down
12 changes: 12 additions & 0 deletions tests/ui/suggestions/type-mismatch-byte-literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,19 @@ fn main() {
//~^ ERROR: mismatched types [E0308]
//~| HELP: if you meant to write a byte literal, prefix with `b`

let _a: u8 = '\x20';
//~^ ERROR: mismatched types [E0308]
//~| HELP: if you meant to write a byte literal, prefix with `b`

// Do not issue the suggestion if the char literal is a Unicode escape
foo('\u{0080}');
//~^ ERROR: mismatched types [E0308]

// Do not issue the suggestion if the char literal isn't ASCII
let _t: u8 = '€';
//~^ ERROR: mismatched types [E0308]

// Do not issue the suggestion if the char literal isn't ASCII
foo('\u{1f980}');
//~^ ERROR: mismatched types [E0308]
}
45 changes: 43 additions & 2 deletions tests/ui/suggestions/type-mismatch-byte-literal.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,54 @@ LL | foo(b'#');
| ~~~~

error[E0308]: mismatched types
--> $DIR/type-mismatch-byte-literal.rs:16:18
--> $DIR/type-mismatch-byte-literal.rs:15:18
|
LL | let _a: u8 = '\x20';
| -- ^^^^^^ expected `u8`, found `char`
| |
| expected due to this
|
help: if you meant to write a byte literal, prefix with `b`
|
LL | let _a: u8 = b'\x20';
| ~~~~~~~

error[E0308]: mismatched types
--> $DIR/type-mismatch-byte-literal.rs:20:9
|
LL | foo('\u{0080}');
| --- ^^^^^^^^^^ expected `u8`, found `char`
| |
| arguments to this function are incorrect
|
note: function defined here
--> $DIR/type-mismatch-byte-literal.rs:4:4
|
LL | fn foo(_t: u8) {}
| ^^^ ------

error[E0308]: mismatched types
--> $DIR/type-mismatch-byte-literal.rs:24:18
|
LL | let _t: u8 = '€';
| -- ^^^ expected `u8`, found `char`
| |
| expected due to this

error: aborting due to 3 previous errors
error[E0308]: mismatched types
--> $DIR/type-mismatch-byte-literal.rs:28:9
|
LL | foo('\u{1f980}');
| --- ^^^^^^^^^^^ expected `u8`, found `char`
| |
| arguments to this function are incorrect
|
note: function defined here
--> $DIR/type-mismatch-byte-literal.rs:4:4
|
LL | fn foo(_t: u8) {}
| ^^^ ------

error: aborting due to 6 previous errors

For more information about this error, try `rustc --explain E0308`.