---

yaml
---
r: 233486
b: refs/heads/beta
c: 62ba85b
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 4b242497d3a3b3fc4e56cf80053dfbecf1b1d308
+refs/heads/beta: 62ba85b7aaf4ac1dbbf8b89605ff24d40f93969f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_trans/trans/intrinsic.rs

@@ -1358,10 +1358,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
 
     if let Some(cmp_op) = comparison {
         assert_eq!(arg_tys.len(), 2);
-        require!(arg_tys[0].is_simd(tcx),
+        require!(arg_tys[0].is_simd(),
                  "SIMD comparison intrinsic monomorphized for non-SIMD argument type `{}`",
                  arg_tys[0]);
-        require!(ret_ty.is_simd(tcx),
+        require!(ret_ty.is_simd(),
                  "SIMD comparison intrinsic monomorphized for non-SIMD return type `{}`",
                  ret_ty);
 
@@ -1393,10 +1393,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
                                           "bad `simd_shuffle` instruction only caught in trans?")
         };
 
-        require!(arg_tys[0].is_simd(tcx),
+        require!(arg_tys[0].is_simd(),
                  "SIMD shuffle intrinsic monomorphized with non-SIMD input type `{}`",
                  arg_tys[0]);
-        require!(ret_ty.is_simd(tcx),
+        require!(ret_ty.is_simd(),
                  "SIMD shuffle intrinsic monomorphized for non-SIMD return type `{}`",
                  ret_ty);
 
@@ -1451,7 +1451,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
     }
 
     if name == "simd_insert" {
-        require!(arg_tys[0].is_simd(tcx),
+        require!(arg_tys[0].is_simd(),
                  "SIMD insert intrinsic monomorphized for non-SIMD input type");
 
         let elem_ty = arg_tys[0].simd_type(tcx);
@@ -1460,7 +1460,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
         return InsertElement(bcx, llargs[0], llargs[2], llargs[1])
     }
     if name == "simd_extract" {
-        require!(arg_tys[0].is_simd(tcx),
+        require!(arg_tys[0].is_simd(),
                  "SIMD insert intrinsic monomorphized for non-SIMD input type");
 
         let elem_ty = arg_tys[0].simd_type(tcx);
@@ -1470,10 +1470,10 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
     }
 
     if name == "simd_cast" {
-        require!(arg_tys[0].is_simd(tcx),
+        require!(arg_tys[0].is_simd(),
                  "SIMD cast intrinsic monomorphized with non-SIMD input type `{}`",
                  arg_tys[0]);
-        require!(ret_ty.is_simd(tcx),
+        require!(ret_ty.is_simd(),
                  "SIMD cast intrinsic monomorphized with non-SIMD return type `{}`",
                  ret_ty);
         require!(arg_tys[0].simd_size(tcx) == ret_ty.simd_size(tcx),
@@ -1614,7 +1614,7 @@ fn generic_simd_intrinsic<'blk, 'tcx, 'a>
         ($($name: ident: $($($p: ident),* => $call: expr),*;)*) => {
             $(
                 if name == stringify!($name) {
-                    require!(arg_tys[0].is_simd(tcx),
+                    require!(arg_tys[0].is_simd(),
                              "`{}` intrinsic monomorphized with non-SIMD type `{}`",
                              name, arg_tys[0]);
                     let in_ = arg_tys[0].simd_type(tcx);

branches/beta/src/librustc_typeck/check/intrinsic.rs

@@ -481,7 +481,7 @@ fn match_intrinsic_type_to_type<'tcx, 'a>(
         },
         Pointer(_) => unimplemented!(),
         Vector(ref inner_expected, len) => {
-            if !t.is_simd(tcx) {
+            if !t.is_simd() {
                 simple_error(&format!("non-simd type `{}`", t),
                              "simd type");
                 return;