about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Koropoff <bkoropoff@gmail.com>2014-11-01 20:15:48 -0700
committerBrian Koropoff <bkoropoff@gmail.com>2014-11-01 20:15:48 -0700
commitcf7756442f94a94bbb0b559ae8eb9b97031d8d13 (patch)
tree289d48c9f126551cb30280cb85abbe8b764f9749
parent3327ecca422046699315122345c6c050ab73804b (diff)
downloadrust-cf7756442f94a94bbb0b559ae8eb9b97031d8d13.tar.gz
rust-cf7756442f94a94bbb0b559ae8eb9b97031d8d13.zip
Always consider static methods object-safe
This also fixes #18490 as a side-effect by avoiding a later
out-of-bounds slice.
-rw-r--r--src/librustc/middle/typeck/check/vtable.rs6
1 files changed, 5 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 => {}
         }