From 1cc979b771cab2d9e190bbaef6aaf05e816b3c68 Mon Sep 17 00:00:00 2001 From: Yuning Zhang Date: Wed, 2 Jan 2019 12:01:48 -0500 Subject: [PATCH] Update error messages --- src/ch02-00-guessing-game-tutorial.md | 2 +- src/ch03-05-control-flow.md | 4 ++-- src/ch10-01-syntax.md | 4 ++-- src/ch13-01-closures.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ch02-00-guessing-game-tutorial.md b/src/ch02-00-guessing-game-tutorial.md index 897d0c8d05..70bc88816d 100644 --- a/src/ch02-00-guessing-game-tutorial.md +++ b/src/ch02-00-guessing-game-tutorial.md @@ -668,7 +668,7 @@ error[E0308]: mismatched types --> src/main.rs:23:21 | 23 | match guess.cmp(&secret_number) { - | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found integral variable + | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found integer | = note: expected type `&std::string::String` = note: found type `&{integer}` diff --git a/src/ch03-05-control-flow.md b/src/ch03-05-control-flow.md index 6c7c2c0211..b78ba10003 100644 --- a/src/ch03-05-control-flow.md +++ b/src/ch03-05-control-flow.md @@ -95,7 +95,7 @@ error[E0308]: mismatched types --> src/main.rs:4:8 | 4 | if number { - | ^^^^^^ expected bool, found integral variable + | ^^^^^^ expected bool, found integer | = note: expected type `bool` found type `{integer}` @@ -239,7 +239,7 @@ error[E0308]: if and else have incompatible types 6 | | } else { 7 | | "six" 8 | | }; - | |_____^ expected integral variable, found &str + | |_____^ expected integer, found &str | = note: expected type `{integer}` found type `&str` diff --git a/src/ch10-01-syntax.md b/src/ch10-01-syntax.md index 9595162e55..2239901425 100644 --- a/src/ch10-01-syntax.md +++ b/src/ch10-01-syntax.md @@ -207,8 +207,8 @@ error[E0308]: mismatched types --> src/main.rs:7:38 | 7 | let wont_work = Point { x: 5, y: 4.0 }; - | ^^^ expected integral variable, found -floating-point variable + | ^^^ expected integer, found +floating-point number | = note: expected type `{integer}` found type `{float}` diff --git a/src/ch13-01-closures.md b/src/ch13-01-closures.md index 05c97c7e6f..f679c1431e 100644 --- a/src/ch13-01-closures.md +++ b/src/ch13-01-closures.md @@ -402,7 +402,7 @@ error[E0308]: mismatched types | | let n = example_closure(5); | ^ expected struct `std::string::String`, found - integral variable + integer | = note: expected type `std::string::String` found type `{integer}`