about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-20 03:57:13 +0000
committerbors <bors@rust-lang.org>2015-09-20 03:57:13 +0000
commitfbce4503f887ce1b3209feea4c8d15080e8ec241 (patch)
treeb91d169676081cb4f2ff898aa77ccaaf873fc524
parent23b1e4807e9d4db14c7a7d09f12daa52e4bfafcf (diff)
parenta51ae514ab2171523869ed81c79be659c38ef923 (diff)
downloadrust-fbce4503f887ce1b3209feea4c8d15080e8ec241.tar.gz
rust-fbce4503f887ce1b3209feea4c8d15080e8ec241.zip
Auto merge of #28519 - wthrowe:fixup-28321, r=alexcrichton
I assume the expected error changed during the development of pull
request #28321 and that wasn't noticed because the test was
accidentally not running.

r? @nikomatsakis
-rw-r--r--src/test/compile-fail/borrowck-loan-of-static-data-issue-27616.rs (renamed from src/test/borrowck-loan-of-static-data-issue-27616.rs)2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/borrowck-loan-of-static-data-issue-27616.rs b/src/test/compile-fail/borrowck-loan-of-static-data-issue-27616.rs
index 228e71025fd..4dbab986881 100644
--- a/src/test/borrowck-loan-of-static-data-issue-27616.rs
+++ b/src/test/compile-fail/borrowck-loan-of-static-data-issue-27616.rs
@@ -23,7 +23,7 @@ fn evil(mut s: &'static mut String)
     let alias: &'static mut String = s;
     let inner: &str = &alias;
     // free value
-    *s = String::new(); //~ ERROR cannot assign
+    *s = String::new(); //~ ERROR use of moved value
     let _spray = "0wned".to_owned();
     // ... and then use it
     println!("{}", inner);