---

yaml
---
r: 275826
b: refs/heads/auto
c: 399149a
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -8,7 +8,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: 906cc48d48d97776905b493a8897569a57b32d64
+refs/heads/auto: 399149ac7efda98e2290d5bf5c38f51d51b5b18f
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/test/compile-fail/transmute-from-fn-item-types-lint.rs

@@ -15,27 +15,27 @@ use std::mem;
 unsafe fn foo() -> (isize, *const (), Option<fn()>) {
     let i = mem::transmute(bar);
     //~^ ERROR is now zero-sized and has to be cast to a pointer before transmuting
-    //~^^ ERROR was previously accepted
+    //~^^ WARNING was previously accepted
 
     let p = mem::transmute(foo);
     //~^ ERROR is now zero-sized and has to be cast to a pointer before transmuting
-    //~^^ ERROR was previously accepted
+    //~^^ WARNING was previously accepted
 
     let of = mem::transmute(main);
     //~^ ERROR is now zero-sized and has to be cast to a pointer before transmuting
-    //~^^ ERROR was previously accepted
+    //~^^ WARNING was previously accepted
 
     (i, p, of)
 }
 
 unsafe fn bar() {
     mem::transmute::<_, *mut ()>(foo);
     //~^ ERROR is now zero-sized and has to be cast to a pointer before transmuting
-    //~^^ ERROR was previously accepted
+    //~^^ WARNING was previously accepted
 
     mem::transmute::<_, fn()>(bar);
     //~^ ERROR is now zero-sized and has to be cast to a pointer before transmuting
-    //~^^ ERROR was previously accepted
+    //~^^ WARNING was previously accepted
 
     // No error if a coercion would otherwise occur.
     mem::transmute::<fn(), usize>(main);