forbid calling functions through pointers of a different type

[rust.git] / src / primval.rs

diff --git a/src/primval.rs b/src/primval.rs
index 0b1658739d9d6a4832abc7cbdac68af8fc546b07..5e1cdac45a1fb2fd68e3fd1818e85f0c3c6fa471 100644 (file)
--- a/src/primval.rs
+++ b/src/primval.rs
@@ -13,7 +13,7 @@ pub enum PrimVal {
     IntegerPtr(u64),
 }
 
-pub fn binary_op(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResult<PrimVal> {
+pub fn binary_op<'tcx>(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResult<'tcx, PrimVal> {
     use rustc::mir::repr::BinOp::*;
     use self::PrimVal::*;
 
@@ -43,7 +43,7 @@ macro_rules! int_binops {
         })
     }
 
-    fn unrelated_ptr_ops(bin_op: mir::BinOp) -> EvalResult<PrimVal> {
+    fn unrelated_ptr_ops<'tcx>(bin_op: mir::BinOp) -> EvalResult<'tcx, PrimVal> {
         use rustc::mir::repr::BinOp::*;
         match bin_op {
             Eq => Ok(Bool(false)),
@@ -108,7 +108,7 @@ fn unrelated_ptr_ops(bin_op: mir::BinOp) -> EvalResult<PrimVal> {
     Ok(val)
 }
 
-pub fn unary_op(un_op: mir::UnOp, val: PrimVal) -> EvalResult<PrimVal> {
+pub fn unary_op<'tcx>(un_op: mir::UnOp, val: PrimVal) -> EvalResult<'tcx, PrimVal> {
     use rustc::mir::repr::UnOp::*;
     use self::PrimVal::*;
     match (un_op, val) {