rollup merge of #18527 : bkoropoff/issue-18490

2 files changed, 32 insertions, 1 deletions

diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs
index a17194f0085..87b0aed4ac4 100644
--- a/src/librustc/middle/typeck/check/vtable.rs
+++ b/src/librustc/middle/typeck/check/vtable.rs
@@ -187,7 +187,11 @@ pub fn check_object_safety(tcx: &ty::ctxt, object_trait: &ty::TyTrait, span: Spa
                                    receiver through a trait object", method_name))
             }
 
-            ty::StaticExplicitSelfCategory |
+            ty::StaticExplicitSelfCategory => {
+                // Static methods are always object-safe since they
+                // can't be called through a trait object
+                return msgs
+            }
             ty::ByReferenceExplicitSelfCategory(..) |
             ty::ByBoxExplicitSelfCategory => {}
         }
diff --git a/src/test/run-pass/trait-object-safety.rs b/src/test/run-pass/trait-object-safety.rs
new file mode 100644
index 00000000000..929cb9e7f17
--- /dev/null
+++ b/src/test/run-pass/trait-object-safety.rs
@@ -0,0 +1,27 @@
+// 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 object-safe methods are identified as such.  Also
+// acts as a regression test for #18490
+
+trait Tr {
+    // Static methods are always safe regardless of other rules
+    fn new() -> Self;
+}
+
+struct St;
+
+impl Tr for St {
+    fn new() -> St { St }
+}
+
+fn main() {
+    &St as &Tr;
+}