From cac995444b69cb1453bc2be1fd5de27f110c0e01 Mon Sep 17 00:00:00 2001
From: Jakub Bukaj <jakub@jakub.cc>
Date: Thu, 30 Oct 2014 21:29:13 +0100
Subject: [PATCH] Add a test for errors unifying an integer variable with a
 float variable

---
 .../integral-variable-unification-error.rs        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/test/compile-fail/integral-variable-unification-error.rs

diff --git a/src/test/compile-fail/integral-variable-unification-error.rs b/src/test/compile-fail/integral-variable-unification-error.rs
new file mode 100644
index 00000000000..fbbe4cf8dbc
--- /dev/null
+++ b/src/test/compile-fail/integral-variable-unification-error.rs
@@ -0,0 +1,15 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let mut x = 2;
+    x = 5.0;
+//~^ ERROR expected `_`, found `_` (expected integral variable, found floating-point variable)
+}