---

yaml
---
r: 162286
b: refs/heads/auto
c: 3246d4f
h: refs/heads/master
v: v3

Author: sfackler

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 616af6eb83630b76bb3a9bde57a00f5ebe5dbd6c
+refs/heads/auto: 3246d4f36979658c61c9e2bcfe524b1d45b3257a
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libsyntax/test.rs

@@ -369,7 +369,7 @@ fn should_fail(i: &ast::Item) -> ShouldFail {
     match i.attrs.iter().find(|attr| attr.check_name("should_fail")) {
         Some(attr) => {
             let msg = attr.meta_item_list()
-                .and_then(|list| list.iter().find(|mi| mi.check_name("message")))
+                .and_then(|list| list.iter().find(|mi| mi.check_name("expected")))
                 .and_then(|mi| mi.value_str());
             ShouldFail::Yes(msg)
         }

branches/auto/src/libtest/lib.rs

@@ -374,7 +374,7 @@ Test Attributes:
     #[should_fail] - This function (also labeled with #[test]) will only pass if
                      the code causes a failure (an assertion failure or panic!)
                      A message may be provided, which the failure string must
-                     contain: #[should_fail(message = "foo")].
+                     contain: #[should_fail(expected = "foo")].
     #[ignore]      - When applied to a function which is already attributed as a
                      test, then the test runner will ignore these tests during
                      normal test runs. Running with --ignored will run these

branches/auto/src/test/run-fail/test-should-fail-bad-message.rs

@@ -14,7 +14,7 @@
 // ignore-pretty: does not work well with `--test`
 
 #[test]
-#[should_fail(message = "foobar")]
+#[should_fail(expected = "foobar")]
 fn test_foo() {
     panic!("blah")
 }

branches/auto/src/test/run-pass/test-should-fail-good-message.rs

@@ -12,13 +12,13 @@
 // ignore-pretty: does not work well with `--test`
 
 #[test]
-#[should_fail(message = "foo")]
+#[should_fail(expected = "foo")]
 fn test_foo() {
     panic!("foo bar")
 }
 
 #[test]
-#[should_fail(message = "foo")]
+#[should_fail(expected = "foo")]
 fn test_foo_dynamic() {
     panic!("{} bar", "foo")
 }