From 68c26b325b35e6984b585d285b17dd5eadb3c860 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 25 Sep 2019 04:16:25 -0700 Subject: [PATCH] Rustup to rustc 1.39.0-nightly (acf7b50c7 2019-09-25) - Addresses inference error - Updates compiletest --- Cargo.toml | 2 +- tests/ui/many_single_char_names.rs | 2 +- tests/ui/many_single_char_names.stderr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8c70bb18939..7ab20320e7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util"} [dev-dependencies] cargo_metadata = "0.8.0" -compiletest_rs = { version = "0.3.22", features = ["tmp"] } +compiletest_rs = { version = "0.3.23", features = ["tmp"] } lazy_static = "1.0" clippy-mini-macro-test = { version = "0.2", path = "mini-macro" } serde = { version = "1.0", features = ["derive"] } diff --git a/tests/ui/many_single_char_names.rs b/tests/ui/many_single_char_names.rs index 81c0427305d..80800e48724 100644 --- a/tests/ui/many_single_char_names.rs +++ b/tests/ui/many_single_char_names.rs @@ -29,7 +29,7 @@ fn bla() { fn bindings(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32) {} fn bindings2() { - let (a, b, c, d, e, f, g, h) = unimplemented!(); + let (a, b, c, d, e, f, g, h): (bool, bool, bool, bool, bool, bool, bool, bool) = unimplemented!(); } fn shadowing() { diff --git a/tests/ui/many_single_char_names.stderr b/tests/ui/many_single_char_names.stderr index a746667baf0..27e62e641ad 100644 --- a/tests/ui/many_single_char_names.stderr +++ b/tests/ui/many_single_char_names.stderr @@ -44,7 +44,7 @@ LL | fn bindings(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32) error: 8 bindings with single-character names in scope --> $DIR/many_single_char_names.rs:32:10 | -LL | let (a, b, c, d, e, f, g, h) = unimplemented!(); +LL | let (a, b, c, d, e, f, g, h): (bool, bool, bool, bool, bool, bool, bool, bool) = unimplemented!(); | ^ ^ ^ ^ ^ ^ ^ ^ error: aborting due to 5 previous errors