---

yaml
---
r: 167927
b: refs/heads/auto
c: 69716ef
h: refs/heads/master
i:
  167925: 07a2009
  167923: 145c19f
  167919: 2001e13
v: v3

Author: nrc

[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: cd31e6ff3987a1e0f94c64f31d6068c459126667
+refs/heads/auto: 69716ef607c3410722f35e31cc6419ad142b7e02
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/compile-fail/trait-object-safety.rs

@@ -0,0 +1,26 @@
+// 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.
+
+// Check that static methods are not object-safe.
+
+trait Tr {
+    fn foo();
+}
+
+struct St;
+
+impl Tr for St {
+    fn foo() {}
+}
+
+fn main() {
+    let _: &Tr = &St; //~ ERROR cannot convert to a trait object because trait `Tr` is not
+    //~^ NOTE cannot call a static method (`foo`) through a trait object
+}

branches/auto/src/test/run-pass/trait-object-safety.rs

@@ -8,20 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Check that object-safe methods are identified as such.  Also
-// acts as a regression test for #18490
+// Check that object-safe methods are identified as such.
 
 trait Tr {
-    // Static methods are always safe regardless of other rules
-    fn new() -> Self;
+    fn foo(&self);
 }
 
 struct St;
 
 impl Tr for St {
-    fn new() -> St { St }
+    fn foo(&self) {}
 }
 
 fn main() {
-    &St as &Tr;
+    let s: &Tr = &St;
+    s.foo();
 }