Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -43,7 +43,7 @@
 
 CARGO_BUILDDEP?=	yes
 .if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.33.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.34.0:lang/${RUST_DEFAULT}
 .endif
 
 # Location of cargo binary (default to lang/rust's Cargo binary)
Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.33.0
-PORTREVISION?=	1
+PORTVERSION?=	1.34.0
+PORTREVISION?=	0
 CATEGORIES=	lang
-MASTER_SITES=	http://static.rust-lang.org/dist/:src \
+MASTER_SITES=	http://dev-static.rust-lang.org/dist/:src \
 		LOCAL/dumbbell/rust:rust_bootstrap \
 		LOCAL/tobik/rust:rust_bootstrap \
 		https://static.rust-lang.org/dist/:rust_bootstrap \
@@ -42,13 +42,13 @@
 CONFLICTS_INSTALL?=	rust-nightly
 
 # See WRKSRC/src/stage0.txt for this date and version values.
-BOOTSTRAPS_DATE?=		2019-01-17
+BOOTSTRAPS_DATE?=		2019-02-28
 BOOTSTRAPS_DATE_aarch64?=	2018-12-20
 BOOTSTRAPS_DATE_armv6?=		2018-12-20
 BOOTSTRAPS_DATE_armv7?=		2018-12-20
 BOOTSTRAPS_DATE_powerpc64?=	2018-12-20
 
-RUST_BOOTSTRAP_VERSION?=	1.32.0
+RUST_BOOTSTRAP_VERSION?=	1.33.0
 RUST_BOOTSTRAP_VERSION_aarch64?=	1.32.0
 RUST_BOOTSTRAP_VERSION_armv6?=	1.32.0
 RUST_BOOTSTRAP_VERSION_armv7?=	1.32.0
@@ -56,7 +56,7 @@
 RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
-CARGO_BOOTSTRAP_VERSION?=	0.33.0
+CARGO_BOOTSTRAP_VERSION?=	0.34.0
 CARGO_BOOTSTRAP_VERSION_aarch64?=	0.33.0
 CARGO_BOOTSTRAP_VERSION_armv6?=	0.33.0
 CARGO_BOOTSTRAP_VERSION_armv7?=	0.33.0
Index: lang/rust/distinfo
===================================================================
--- lang/rust/distinfo
+++ lang/rust/distinfo
@@ -1,27 +1,39 @@
-TIMESTAMP = 1551349163
-SHA256 (rust/rustc-1.33.0-src.tar.xz) = f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71
-SIZE (rust/rustc-1.33.0-src.tar.xz) = 100635400
-SHA256 (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = a14a0e288be8ce894a85810151a2eb70fc86afa36e4a5fae4e903c744b888687
-SIZE (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = 70385575
-SHA256 (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = d50f674379791a93764d383153ed6533cea165ede7f233df4e17563bfdab273c
-SIZE (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 67069445
-SHA256 (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = e780264949c8e597191f38d4930cad8074890a7a48c04cf10e6864ff0eb4bc8a
-SIZE (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = 6253970
-SHA256 (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 7bea209a99b8a3c05a80e55fef293d73a68fa57d58120ed5cd11adc9d6b7ed5c
-SIZE (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 71140698
-SHA256 (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 1189726665509f2a5e44fcdbbe70f691e8ffc748404966c9b73abf62b4f9cb82
-SIZE (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 67402728
-SHA256 (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = cba7cf145100c4e74da1fca20ad272999ec2b55817f26723c3dfc9fd4abd196d
-SIZE (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = 6017543
-SHA256 (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = a13c3f8c17beb6d19f54ac705d87b6dbb9cd09cd945d0ffbaed1a77e8ac38128
-SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 62158d26a9dbc17cfd92882cb48b6ee7a06432b9f18d1f78b90b6973d63be12c
-SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = bfb8986a11034cac7329037a2f24c07bcd62ba2d91838f6c28955b2ee639e361
-SHA256 (rust/2018-12-20/cargo-0.33.0-powerpc64-unknown-freebsd.tar.gz) = 043a4d68de71b868837bc0e30121d4d95282b0d098a1e13da9375f00dd6e51ef
+TIMESTAMP = 1554757553
+SHA256 (rust/rustc-1.34.0-src.tar.xz) = 4ca2324164711ac68e51f691d9912ae740fdb22e806852a7cc80b27a22468a32
+SIZE (rust/rustc-1.34.0-src.tar.xz) = 95041232
+SHA256 (rust/2018-12-20/rustc-1.32.0-aarch64-unknown-freebsd.tar.gz) = 3d1ee268ceba35c899c976fa6d539b39f7ef6fc109190662bc5f5bfd5c843d92
+SIZE (rust/2018-12-20/rustc-1.32.0-aarch64-unknown-freebsd.tar.gz) = 60670237
 SHA256 (rust/2018-12-20/rust-std-1.32.0-aarch64-unknown-freebsd.tar.gz) = c5cb52dab10c19a0bc0548b65a785fdf5765cf43a4a5c6635e44738b9ae69030
+SIZE (rust/2018-12-20/rust-std-1.32.0-aarch64-unknown-freebsd.tar.gz) = 67071136
+SHA256 (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = a13c3f8c17beb6d19f54ac705d87b6dbb9cd09cd945d0ffbaed1a77e8ac38128
+SIZE (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = 5745510
+SHA256 (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8bfc7fc50c50294cf4ded35360b41b590180401a0d2e84256f5931c7c1ff35cd
+SIZE (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 74812594
+SHA256 (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8eec7a21a3368890fdf0b826e7bc1928775724c0a4bd14d86304cc7e48309237
+SIZE (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 71459727
+SHA256 (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 0108a0f2e2c4663b4e5cddd5bee04fd7cf5d2c94feb3fc527254a606ee856928
+SIZE (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 6358006
+SHA256 (rust/2018-12-20/rustc-1.32.0-armv6-unknown-freebsd.tar.gz) = 56af25fcab586a0903c968acb522563a34974f3b141e5044dc8e1ff55c7b2e7b
+SIZE (rust/2018-12-20/rustc-1.32.0-armv6-unknown-freebsd.tar.gz) = 458668
 SHA256 (rust/2018-12-20/rust-std-1.32.0-armv6-unknown-freebsd.tar.gz) = 9572c6db3daaaf1fa5dd1b5ddf2a077e55ebf392ed0bc578dcc5a1ffa75e0343
-SHA256 (rust/2018-12-20/rust-std-1.32.0-armv7-unknown-freebsd.tar.gz) = 0ad6c70d4c0d843f61845db77f7d571befa07e4623029e6b3dd3ce9f9d568c6f
-SHA256 (rust/2018-12-20/rust-std-1.32.0-powerpc64-unknown-freebsd.tar.gz) = d619921dfaccf70cde71b4a00f9dc03a8138d3379a6cb4d8729d74d931c2a38b
-SHA256 (rust/2018-12-20/rustc-1.32.0-aarch64-unknown-freebsd.tar.gz) = 3d1ee268ceba35c899c976fa6d539b39f7ef6fc109190662bc5f5bfd5c843d92
-SHA256 (rust/2018-12-20/rustc-1.32.0-armv6-unknown-freebsd.tar.gz) = c2896bc52a2e005077252062e97a4bd3543b9003b78f95ecd83dda0242f0e6b5
+SIZE (rust/2018-12-20/rust-std-1.32.0-armv6-unknown-freebsd.tar.gz) = 68457237
+SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 62158d26a9dbc17cfd92882cb48b6ee7a06432b9f18d1f78b90b6973d63be12c
+SIZE (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 5799455
 SHA256 (rust/2018-12-20/rustc-1.32.0-armv7-unknown-freebsd.tar.gz) = faf708f0909d4b7e5f8862add9819f5f55cb52b08558760cbdd456e7014df00c
+SIZE (rust/2018-12-20/rustc-1.32.0-armv7-unknown-freebsd.tar.gz) = 61658698
+SHA256 (rust/2018-12-20/rust-std-1.32.0-armv7-unknown-freebsd.tar.gz) = 0ad6c70d4c0d843f61845db77f7d571befa07e4623029e6b3dd3ce9f9d568c6f
+SIZE (rust/2018-12-20/rust-std-1.32.0-armv7-unknown-freebsd.tar.gz) = 67754676
+SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = bfb8986a11034cac7329037a2f24c07bcd62ba2d91838f6c28955b2ee639e361
+SIZE (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = 4944587
+SHA256 (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = f788ef1806f6e51c7df05dc2614f8b95d3d1a59177786dc9c895c16c0d5201aa
+SIZE (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = 76140989
+SHA256 (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 00325440bf2c832f9063042bf8999756466cec23f747b62ad3268a316dae39a9
+SIZE (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 72221278
+SHA256 (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 7943c30e3451972ed1a99f26b079c53a1a7317f63ff60cca1ceeebb80a99dc66
+SIZE (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 6134900
 SHA256 (rust/2018-12-20/rustc-1.32.0-powerpc64-unknown-freebsd.tar.gz) = 83ccfca0e5c5e2df37ea3f4059dfe3e516c4f74045769dac4602a2da2b2ed1a5
+SIZE (rust/2018-12-20/rustc-1.32.0-powerpc64-unknown-freebsd.tar.gz) = 69580455
+SHA256 (rust/2018-12-20/rust-std-1.32.0-powerpc64-unknown-freebsd.tar.gz) = d619921dfaccf70cde71b4a00f9dc03a8138d3379a6cb4d8729d74d931c2a38b
+SIZE (rust/2018-12-20/rust-std-1.32.0-powerpc64-unknown-freebsd.tar.gz) = 70260827
+SHA256 (rust/2018-12-20/cargo-0.33.0-powerpc64-unknown-freebsd.tar.gz) = 043a4d68de71b868837bc0e30121d4d95282b0d098a1e13da9375f00dd6e51ef
+SIZE (rust/2018-12-20/cargo-0.33.0-powerpc64-unknown-freebsd.tar.gz) = 6891125
Index: lang/rust/files/patch-src_bootstrap_bootstrap.py
===================================================================
--- lang/rust/files/patch-src_bootstrap_bootstrap.py
+++ /dev/null
@@ -1,16 +1,5 @@
 --- src/bootstrap/bootstrap.py.orig	2019-01-16 09:30:27 UTC
 +++ src/bootstrap/bootstrap.py
-@@ -240,6 +240,10 @@ def default_build_triple():
-         err = "unknown OS type: {}".format(ostype)
-         sys.exit(err)
- 
-+    if cputype == 'powerpc' and ostype == 'unknown-freebsd':
-+        cputype = subprocess.check_output(
-+              ['uname', '-p']).strip().decode(default_encoding)
-+
-     cputype_mapper = {
-         'BePC': 'i686',
-         'aarch64': 'aarch64',
 @@ -269,6 +273,10 @@ def default_build_triple():
          cputype = 'arm'
          if ostype == 'linux-android':
Index: lang/rust/files/patch-src_bootstrap_native.rs
===================================================================
--- lang/rust/files/patch-src_bootstrap_native.rs
+++ lang/rust/files/patch-src_bootstrap_native.rs
@@ -1,6 +1,6 @@
---- src/bootstrap/native.rs.orig	2019-01-16 09:30:27 UTC
+--- src/bootstrap/native.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/bootstrap/native.rs
-@@ -218,6 +218,10 @@ impl Step for Llvm {
+@@ -209,6 +209,10 @@ impl Step for Llvm {
              }
          }
  
Index: lang/rust/files/patch-src_librustc__llvm_build.rs
===================================================================
--- lang/rust/files/patch-src_librustc__llvm_build.rs
+++ lang/rust/files/patch-src_librustc__llvm_build.rs
@@ -1,6 +1,6 @@
---- src/librustc_llvm/build.rs.orig	2019-01-16 09:30:27 UTC
+--- src/librustc_llvm/build.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_llvm/build.rs
-@@ -256,7 +256,10 @@ fn main() {
+@@ -254,7 +254,10 @@ fn main() {
      };
  
      // C++ runtime library
Index: lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
+++ lang/rust/files/patch-src_librustc__target_spec_armv6__unknown__freebsd.rs
@@ -1,7 +1,7 @@
---- src/librustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
+--- src/librustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-04-08 21:09:22 UTC
 +++ src/librustc_target/spec/armv6_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
Index: lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
+++ lang/rust/files/patch-src_librustc__target_spec_armv7__unknown__freebsd.rs
@@ -1,7 +1,7 @@
---- src/librustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
+--- src/librustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-04-08 21:09:22 UTC
 +++ src/librustc_target/spec/armv7_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
Index: lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
+++ lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
@@ -1,6 +1,6 @@
---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2018-06-19 04:35:53 UTC
+--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_target/spec/i686_unknown_freebsd.rs
-@@ -12,7 +12,7 @@ use spec::{LinkerFlavor, Target, TargetResult};
+@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult};
  
  pub fn target() -> TargetResult {
      let mut base = super::freebsd_base::opts();
Index: lang/rust/files/patch-src_librustc__target_spec_mod.rs
===================================================================
--- lang/rust/files/patch-src_librustc__target_spec_mod.rs
+++ lang/rust/files/patch-src_librustc__target_spec_mod.rs
@@ -1,13 +1,11 @@
---- src/librustc_target/spec/mod.rs.orig	2019-01-16 09:30:27 UTC
+--- src/librustc_target/spec/mod.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/librustc_target/spec/mod.rs
-@@ -333,7 +333,10 @@ supported_targets! {
+@@ -376,6 +376,8 @@ supported_targets! {
      ("aarch64-linux-android", aarch64_linux_android),
  
      ("aarch64-unknown-freebsd", aarch64_unknown_freebsd),
 +    ("armv6-unknown-freebsd", armv6_unknown_freebsd),
 +    ("armv7-unknown-freebsd", armv7_unknown_freebsd),
      ("i686-unknown-freebsd", i686_unknown_freebsd),
-+    ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
+     ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
      ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
- 
-     ("i686-unknown-dragonfly", i686_unknown_dragonfly),
Index: lang/rust/files/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-src_librustc__target_spec_powerpc64__unknown__freebsd.rs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/librustc_target/spec/powerpc64_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
-+++ src/librustc_target/spec/powerpc64_unknown_freebsd.rs
-@@ -0,0 +1,22 @@
-+use spec::{LinkerFlavor, Target, TargetResult};
-+
-+pub fn target() -> TargetResult {
-+    let mut base = super::freebsd_base::opts();
-+    base.cpu = "ppc64".to_string();
-+    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
-+    base.max_atomic_width = Some(64);
-+
-+    Ok(Target {
-+        llvm_target: "powerpc64-unknown-freebsd".to_string(),
-+        target_endian: "big".to_string(),
-+        target_pointer_width: "64".to_string(),
-+        target_c_int_width: "32".to_string(),
-+        data_layout: "E-m:e-i64:64-n32:64".to_string(),
-+        arch: "powerpc64".to_string(),
-+        target_os: "freebsd".to_string(),
-+        target_env: String::new(),
-+        target_vendor: "unknown".to_string(),
-+        linker_flavor: LinkerFlavor::Gcc,
-+        options: base,
-+    })
-+}
Index: lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
===================================================================
--- lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
+++ lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs
@@ -1,6 +1,6 @@
---- src/libstd/sys/unix/stack_overflow.rs.orig	2019-01-16 09:30:27 UTC
+--- src/libstd/sys/unix/stack_overflow.rs.orig	2019-04-08 12:42:31 UTC
 +++ src/libstd/sys/unix/stack_overflow.rs
-@@ -151,6 +151,7 @@ mod imp {
+@@ -141,6 +141,7 @@ mod imp {
      #[cfg(any(target_os = "linux",
                target_os = "macos",
                target_os = "bitrig",
@@ -8,7 +8,7 @@
                target_os = "netbsd",
                target_os = "openbsd",
                target_os = "solaris"))]
-@@ -158,8 +159,7 @@ mod imp {
+@@ -148,8 +149,7 @@ mod imp {
          libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ }
      }
  
Index: lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
===================================================================
--- lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
+++ lang/rust/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
@@ -1,5 +1,5 @@
---- src/llvm/utils/llvm-build/llvmbuild/main.py.orig	2018-12-13 15:33:50 UTC
-+++ src/llvm/utils/llvm-build/llvmbuild/main.py
+--- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig	2018-12-13 15:33:50 UTC
++++ src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py
 @@ -659,6 +659,8 @@ def add_magic_target_components(parser, project, opts)
      # We handle a few special cases of target names here for historical
      # reasons, as these are the names configure currently comes up with.
Index: lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
===================================================================
--- lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
+++ lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
@@ -1,11 +0,0 @@
---- src/llvm/utils/llvm-build/llvmbuild/main.py.orig	2018-12-13 15:33:50 UTC
-+++ src/llvm/utils/llvm-build/llvmbuild/main.py
-@@ -659,6 +659,8 @@ def add_magic_target_components(parser, project, opts)
-     # We handle a few special cases of target names here for historical
-     # reasons, as these are the names configure currently comes up with.
-     native_target_name = { 'x86' : 'X86',
-+                           'i386' : 'X86',
-+                           'amd64' : 'X86',
-                            'x86_64' : 'X86',
-                            'Unknown' : None }.get(opts.native_target,
-                                                   opts.native_target)
Index: lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs
===================================================================
--- lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs
+++ lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_aarch64.rs
@@ -11,8 +11,8 @@
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
 
---- src/stdsimd/stdsimd/arch/detect/os/aarch64.rs.orig	2019-02-25 09:19:48 UTC
-+++ src/stdsimd/stdsimd/arch/detect/os/aarch64.rs
+--- src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs.orig	2019-04-08 12:42:49 UTC
++++ src/stdsimd/crates/std_detect/src/detect/os/aarch64.rs
 @@ -6,7 +6,7 @@
  //! AArch64 system registers ID_AA64ISAR0_EL1, ID_AA64PFR0_EL1, ID_AA64ISAR1_EL1
  //! have bits dedicated to features like AdvSIMD, CRC32, AES, atomics (LSE), etc.
Index: lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs
===================================================================
--- lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs
+++ lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs
@@ -1,24 +0,0 @@
-error: `[7:4]` cannot be resolved, ignoring it...
- --> src/libstd/../stdsimd/stdsimd/arch/detect/os/aarch64.rs:9:27
-  |
-9 | //! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported.
-  |                           ^^^ cannot be resolved, ignoring
-  |
-note: lint level defined here
- --> src/libstd/lib.rs:215:9
-  |
-21| #![deny(intra_doc_link_resolution_failure)]
-  |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
-
---- src/stdsimd/stdsimd/arch/detect/os/aarch64.rs.orig	2019-02-25 09:19:48 UTC
-+++ src/stdsimd/stdsimd/arch/detect/os/aarch64.rs
-@@ -6,7 +6,7 @@
- //! AArch64 system registers ID_AA64ISAR0_EL1, ID_AA64PFR0_EL1, ID_AA64ISAR1_EL1
- //! have bits dedicated to features like AdvSIMD, CRC32, AES, atomics (LSE), etc.
- //! Each part of the register indicates the level of support for a certain feature, e.g.
--//! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported.
-+//! when ID_AA64ISAR0_EL1\[7:4\] is >= 1, AES is supported; when it's >= 2, PMULL is supported.
- //!
- //! For proper support of [SoCs where different cores have different capabilities](https://medium.com/@jadr2ddude/a-big-little-problem-a-tale-of-big-little-gone-wrong-e7778ce744bb),
- //! the OS has to always report only the features supported by all cores, like [FreeBSD does](https://reviews.freebsd.org/D17137#393947).
Index: lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
===================================================================
--- lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
+++ lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
@@ -1,6 +1,6 @@
---- vendor/backtrace/src/backtrace/libunwind.rs.orig	2019-01-16 11:06:07 UTC
+--- vendor/backtrace/src/backtrace/libunwind.rs.orig	2019-04-08 14:18:22 UTC
 +++ vendor/backtrace/src/backtrace/libunwind.rs
-@@ -115,12 +115,14 @@ mod uw {
+@@ -113,12 +113,14 @@ mod uw {
  
          // available since GCC 4.2.0, should be fine for our purpose
          #[cfg(all(not(all(target_os = "android", target_arch = "arm")),
@@ -15,7 +15,7 @@
                    not(all(target_os = "linux", target_arch = "arm"))))]
          pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
              -> *mut c_void;
-@@ -130,6 +132,7 @@ mod uw {
+@@ -128,6 +130,7 @@ mod uw {
      // expansion of the macro. This is all copy/pasted directly from the
      // header file with the definition of _Unwind_GetIP.
      #[cfg(any(all(target_os = "android", target_arch = "arm"),
@@ -23,7 +23,7 @@
                all(target_os = "linux", target_arch = "arm")))]
      pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
          #[repr(C)]
-@@ -177,6 +180,7 @@ mod uw {
+@@ -175,6 +178,7 @@ mod uw {
      // This function doesn't exist on Android or ARM/Linux, so make it same
      // to _Unwind_GetIP
      #[cfg(any(all(target_os = "android", target_arch = "arm"),
@@ -31,7 +31,7 @@
                all(target_os = "linux", target_arch = "arm")))]
      pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
                                      ip_before_insn: *mut c_int)
-@@ -189,6 +193,7 @@ mod uw {
+@@ -187,6 +191,7 @@ mod uw {
      // This function also doesn't exist on Android or ARM/Linux, so make it
      // a no-op
      #[cfg(any(target_os = "android",
Index: lang/rust/files/patch-vendor_compiler__builtins_build.rs
===================================================================
--- lang/rust/files/patch-vendor_compiler__builtins_build.rs
+++ lang/rust/files/patch-vendor_compiler__builtins_build.rs
@@ -1,6 +1,6 @@
---- vendor/compiler_builtins/build.rs.orig	2019-01-16 09:30:44 UTC
+--- vendor/compiler_builtins/build.rs.orig	2019-04-08 14:18:23 UTC
 +++ vendor/compiler_builtins/build.rs
-@@ -308,6 +308,10 @@ mod c {
+@@ -311,6 +311,10 @@ mod c {
                  ],
              );
  
Index: lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
===================================================================
--- lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
+++ lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
@@ -1,6 +1,6 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2019-01-16 11:06:08 UTC
+--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2019-04-08 14:18:24 UTC
 +++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1154,6 +1154,12 @@ cfg_if! {
+@@ -1155,6 +1155,12 @@ cfg_if! {
      } else if #[cfg(target_arch = "aarch64")] {
          mod aarch64;
          pub use self::aarch64::*;
Index: lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
+++ lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv6__unknown__freebsd.rs
@@ -1,7 +1,7 @@
 --- vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
 +++ vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
Index: lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
+++ lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_armv7__unknown__freebsd.rs
@@ -1,7 +1,7 @@
 --- vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
 +++ vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs
 @@ -0,0 +1,24 @@
-+use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
++use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
 +
 +pub fn target() -> TargetResult {
 +    let base = super::freebsd_base::opts();
Index: lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
===================================================================
--- lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
+++ lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_mod.rs
@@ -1,13 +1,11 @@
---- vendor/rustc-ap-rustc_target/spec/mod.rs.orig	2019-01-16 11:06:09 UTC
+--- vendor/rustc-ap-rustc_target/spec/mod.rs.orig	2019-04-08 14:18:26 UTC
 +++ vendor/rustc-ap-rustc_target/spec/mod.rs
-@@ -331,7 +331,10 @@ supported_targets! {
+@@ -368,6 +368,8 @@ supported_targets! {
      ("aarch64-linux-android", aarch64_linux_android),
  
      ("aarch64-unknown-freebsd", aarch64_unknown_freebsd),
 +    ("armv6-unknown-freebsd", armv6_unknown_freebsd),
 +    ("armv7-unknown-freebsd", armv7_unknown_freebsd),
      ("i686-unknown-freebsd", i686_unknown_freebsd),
-+    ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
+     ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
      ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
- 
-     ("i686-unknown-dragonfly", i686_unknown_dragonfly),
Index: lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_powerpc64__unknown__freebsd.rs
===================================================================
--- lang/rust/files/patch-vendor_rustc-ap-rustc__target_spec_powerpc64__unknown__freebsd.rs
+++ /dev/null
@@ -1,25 +0,0 @@
---- vendor/rustc-ap-rustc_target/spec/powerpc64_unknown_freebsd.rs.orig	2019-02-15 13:41:07 UTC
-+++ vendor/rustc-ap-rustc_target/spec/powerpc64_unknown_freebsd.rs
-@@ -0,0 +1,22 @@
-+use spec::{LinkerFlavor, Target, TargetResult};
-+
-+pub fn target() -> TargetResult {
-+    let mut base = super::freebsd_base::opts();
-+    base.cpu = "ppc64".to_string();
-+    base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
-+    base.max_atomic_width = Some(64);
-+
-+    Ok(Target {
-+        llvm_target: "powerpc64-unknown-freebsd".to_string(),
-+        target_endian: "big".to_string(),
-+        target_pointer_width: "64".to_string(),
-+        target_c_int_width: "32".to_string(),
-+        data_layout: "E-m:e-i64:64-n32:64".to_string(),
-+        arch: "powerpc64".to_string(),
-+        target_os: "freebsd".to_string(),
-+        target_env: String::new(),
-+        target_vendor: "unknown".to_string(),
-+        linker_flavor: LinkerFlavor::Gcc,
-+        options: base,
-+    })
-+}
Index: textproc/ripgrep/files/patch-no-bitmask
===================================================================
--- textproc/ripgrep/files/patch-no-bitmask
+++ /dev/null
@@ -1,663 +0,0 @@
-Workaround from Firefox 67 until Rust 1.34 update
-
-https://github.com/hsivonen/packed_simd/commit/3541e3818fdc
-
---- cargo-crates/packed_simd-0.3.3/src/api.rs.orig	2019-02-05 20:18:53 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/api.rs
-@@ -1,7 +1,5 @@
- //! Implements the Simd<[T; N]> APIs
- 
--#[macro_use]
--mod bitmask;
- crate mod cast;
- #[macro_use]
- mod cmp;
-@@ -41,7 +39,7 @@ crate mod into_bits;
- 
- macro_rules! impl_i {
-     ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident
--     | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),*
-+     | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),*
-      | From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => {
-         impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt
-                           | $($elem_ids),* | $(#[$doc])*);
-@@ -95,7 +93,6 @@ macro_rules! impl_i {
-         );
-         impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
-         impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
--        impl_bitmask!($tuple_id | $ibitmask_ty | (-1, 0) | $test_tt);
- 
-         test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt);
-         test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
-@@ -105,7 +102,7 @@ macro_rules! impl_i {
- 
- macro_rules! impl_u {
-     ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident
--     | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),*
-+     | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),*
-      | From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => {
-         impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt
-                           | $($elem_ids),* | $(#[$doc])*);
-@@ -158,8 +155,6 @@ macro_rules! impl_u {
-         );
-         impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
-         impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
--        impl_bitmask!($tuple_id | $ibitmask_ty | ($ielem_ty::max_value(), 0) |
--                      $test_tt);
- 
-         test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt);
-         test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
-@@ -227,8 +222,7 @@ macro_rules! impl_f {
- }
- 
- macro_rules! impl_m {
--    ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident
--     | $ielem_ty:ident, $ibitmask_ty:ident
-+    ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident | $ielem_ty:ident
-      | $test_tt:tt | $($elem_ids:ident),* | From: $($from_vec_ty:ident),*
-      | $(#[$doc:meta])*) => {
-         impl_minimal_mask!(
-@@ -271,7 +265,6 @@ macro_rules! impl_m {
-             [$elem_ty; $elem_n]: $tuple_id | $test_tt | (false, true)
-         );
-         impl_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
--        impl_bitmask!($tuple_id | $ibitmask_ty | (true, false) | $test_tt);
- 
-         test_cmp_partial_ord_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
-         test_shuffle1_dyn_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
---- cargo-crates/packed_simd-0.3.3/src/api/bitmask.rs.orig	2019-02-05 20:18:53 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/api/bitmask.rs
-@@ -1,82 +0,0 @@
--//! Bitmask API
--
--macro_rules! impl_bitmask {
--    ($id:ident | $ibitmask_ty:ident | ($set:expr, $clear:expr)
--     | $test_tt:tt) => {
--        impl $id {
--            /// Creates a bitmask with the MSB of each vector lane.
--            ///
--            /// If the vector has less than 8 lanes, the bits that do not
--            /// correspond to any vector lanes are cleared.
--            #[inline]
--            pub fn bitmask(self) -> $ibitmask_ty {
--                unsafe { codegen::llvm::simd_bitmask(self.0) }
--            }
--        }
--
--        test_if! {
--            $test_tt:
--            paste::item! {
--                #[cfg(not(any(
--                    // FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/210
--                    all(target_arch = "mips", target_endian = "big"),
--                    all(target_arch = "mips64", target_endian = "big"),
--                    target_arch = "sparc64",
--                    target_arch = "s390x",
--                )))]
--                pub mod [<$id _bitmask>] {
--                    use super::*;
--                    #[cfg_attr(not(target_arch = "wasm32"), test)]
--                    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
--                    fn bitmask() {
--                        // clear all lanes
--                        let vec = $id::splat($clear as _);
--                        let bitmask: $ibitmask_ty = 0;
--                        assert_eq!(vec.bitmask(), bitmask);
--
--                        // set even lanes
--                        let mut vec = $id::splat($clear as _);
--                        for i in 0..$id::lanes() {
--                            if i % 2 == 0 {
--                                vec = vec.replace(i, $set as _);
--                            }
--                        }
--                        // create bitmask with even lanes set:
--                        let mut bitmask: $ibitmask_ty = 0;
--                        for i in 0..$id::lanes() {
--                            if i % 2 == 0 {
--                                bitmask |= 1 << i;
--                            }
--                        }
--                        assert_eq!(vec.bitmask(), bitmask);
--
--
--                        // set odd lanes
--                        let mut vec = $id::splat($clear as _);
--                        for i in 0..$id::lanes() {
--                            if i % 2 != 0 {
--                                vec = vec.replace(i, $set as _);
--                            }
--                        }
--                        // create bitmask with odd lanes set:
--                        let mut bitmask: $ibitmask_ty = 0;
--                        for i in 0..$id::lanes() {
--                            if i % 2 != 0 {
--                                bitmask |= 1 << i;
--                            }
--                        }
--                        assert_eq!(vec.bitmask(), bitmask);
--
--                        // set all lanes
--                        let vec = $id::splat($set as _);
--                        let mut bitmask: $ibitmask_ty = 0;
--                        for i in 0..$id::lanes() {
--                            bitmask |= 1 << i;
--                        }
--                        assert_eq!(vec.bitmask(), bitmask);
--                    }
--                }
--            }
--        }
--    };
--}
---- cargo-crates/packed_simd-0.3.3/src/codegen/llvm.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/codegen/llvm.rs
-@@ -96,6 +96,4 @@ extern "platform-intrinsic" {
- 
-     crate fn simd_gather<T, P, M>(value: T, pointers: P, mask: M) -> T;
-     crate fn simd_scatter<T, P, M>(value: T, pointers: P, mask: M);
--
--    crate fn simd_bitmask<T, U>(value: T) -> U;
- }
---- cargo-crates/packed_simd-0.3.3/src/v128.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v128.rs
-@@ -3,40 +3,40 @@
- 
- use crate::*;
- 
--impl_i!([i8; 16]: i8x16, m8x16 | i8, u16 | test_v128 |
-+impl_i!([i8; 16]: i8x16, m8x16 | i8 | test_v128 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: |
-         /// A 128-bit vector with 16 `i8` lanes.
- );
--impl_u!([u8; 16]: u8x16, m8x16 | u8, u16 | test_v128 |
-+impl_u!([u8; 16]: u8x16, m8x16 | u8 | test_v128 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: |
-         /// A 128-bit vector with 16 `u8` lanes.
- );
--impl_m!([m8; 16]: m8x16 | i8, u16 | test_v128 |
-+impl_m!([m8; 16]: m8x16 | i8 | test_v128 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: m16x16 |
-         /// A 128-bit vector mask with 16 `m8` lanes.
- );
- 
--impl_i!([i16; 8]: i16x8, m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_i!([i16; 8]: i16x8, m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: i8x8, u8x8 |
-         /// A 128-bit vector with 8 `i16` lanes.
- );
--impl_u!([u16; 8]: u16x8, m16x8 | u16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_u!([u16; 8]: u16x8, m16x8 | u16| test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: u8x8 |
-         /// A 128-bit vector with 8 `u16` lanes.
- );
--impl_m!([m16; 8]: m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_m!([m16; 8]: m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: m8x8, m32x8 |
-         /// A 128-bit vector mask with 8 `m16` lanes.
- );
- 
--impl_i!([i32; 4]: i32x4, m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 |
-+impl_i!([i32; 4]: i32x4, m32x4 | i32 | test_v128 | x0, x1, x2, x3 |
-         From: i8x4, u8x4, i16x4, u16x4  |
-         /// A 128-bit vector with 4 `i32` lanes.
- );
--impl_u!([u32; 4]: u32x4, m32x4 | u32, u8 | test_v128 | x0, x1, x2, x3 |
-+impl_u!([u32; 4]: u32x4, m32x4 | u32| test_v128 | x0, x1, x2, x3 |
-         From: u8x4, u16x4 |
-         /// A 128-bit vector with 4 `u32` lanes.
- );
-@@ -44,16 +44,16 @@ impl_f!([f32; 4]: f32x4, m32x4 | f32 | test_v128 | x0,
-         From: i8x4, u8x4, i16x4, u16x4 |
-         /// A 128-bit vector with 4 `f32` lanes.
- );
--impl_m!([m32; 4]: m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 |
-+impl_m!([m32; 4]: m32x4 | i32 | test_v128 | x0, x1, x2, x3 |
-         From: m8x4, m16x4, m64x4 |
-         /// A 128-bit vector mask with 4 `m32` lanes.
- );
- 
--impl_i!([i64; 2]: i64x2, m64x2 | i64, u8 | test_v128 | x0, x1 |
-+impl_i!([i64; 2]: i64x2, m64x2 | i64 | test_v128 | x0, x1 |
-         From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2 |
-         /// A 128-bit vector with 2 `i64` lanes.
- );
--impl_u!([u64; 2]: u64x2, m64x2 | u64, u8 | test_v128 | x0, x1 |
-+impl_u!([u64; 2]: u64x2, m64x2 | u64 | test_v128 | x0, x1 |
-         From: u8x2, u16x2, u32x2 |
-         /// A 128-bit vector with 2 `u64` lanes.
- );
-@@ -61,20 +61,20 @@ impl_f!([f64; 2]: f64x2, m64x2 | f64 | test_v128 | x0,
-         From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, f32x2 |
-         /// A 128-bit vector with 2 `f64` lanes.
- );
--impl_m!([m64; 2]: m64x2 | i64, u8 | test_v128 | x0, x1 |
-+impl_m!([m64; 2]: m64x2 | i64 | test_v128 | x0, x1 |
-         From: m8x2, m16x2, m32x2, m128x2 |
-         /// A 128-bit vector mask with 2 `m64` lanes.
- );
- 
--impl_i!([i128; 1]: i128x1, m128x1 | i128, u8 | test_v128 | x0 |
-+impl_i!([i128; 1]: i128x1, m128x1 | i128 | test_v128 | x0 |
-         From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1, i64x1, u64x1 */ | // FIXME: unary small vector types
-         /// A 128-bit vector with 1 `i128` lane.
- );
--impl_u!([u128; 1]: u128x1, m128x1 | u128, u8 | test_v128 | x0 |
-+impl_u!([u128; 1]: u128x1, m128x1 | u128 | test_v128 | x0 |
-         From: /*u8x1, u16x1, u32x1, u64x1 */ | // FIXME: unary small vector types
-         /// A 128-bit vector with 1 `u128` lane.
- );
--impl_m!([m128; 1]: m128x1 | i128, u8 | test_v128 | x0 |
-+impl_m!([m128; 1]: m128x1 | i128 | test_v128 | x0 |
-         From: /*m8x1, m16x1, m32x1, m64x1 */ | // FIXME: unary small vector types
-         /// A 128-bit vector mask with 1 `m128` lane.
- );
---- cargo-crates/packed_simd-0.3.3/src/v16.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v16.rs
-@@ -2,15 +2,15 @@
- 
- use crate::*;
- 
--impl_i!([i8; 2]: i8x2, m8x2 | i8, u8 | test_v16 | x0, x1 |
-+impl_i!([i8; 2]: i8x2, m8x2 | i8 | test_v16 | x0, x1 |
-         From: |
-         /// A 16-bit vector with 2 `i8` lanes.
- );
--impl_u!([u8; 2]: u8x2, m8x2 | u8, u8 | test_v16 | x0, x1 |
-+impl_u!([u8; 2]: u8x2, m8x2 | u8 | test_v16 | x0, x1 |
-         From: |
-         /// A 16-bit vector with 2 `u8` lanes.
- );
--impl_m!([m8; 2]: m8x2 | i8, u8 | test_v16 | x0, x1 |
-+impl_m!([m8; 2]: m8x2 | i8 | test_v16 | x0, x1 |
-         From: m16x2, m32x2, m64x2, m128x2 |
-         /// A 16-bit vector mask with 2 `m8` lanes.
- );
---- cargo-crates/packed_simd-0.3.3/src/v256.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v256.rs
-@@ -3,46 +3,46 @@
- 
- use crate::*;
- 
--impl_i!([i8; 32]: i8x32, m8x32 | i8, u32 | test_v256 |
-+impl_i!([i8; 32]: i8x32, m8x32 | i8 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From: |
-         /// A 256-bit vector with 32 `i8` lanes.
- );
--impl_u!([u8; 32]: u8x32, m8x32 | u8, u32 | test_v256 |
-+impl_u!([u8; 32]: u8x32, m8x32 | u8 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From: |
-         /// A 256-bit vector with 32 `u8` lanes.
- );
--impl_m!([m8; 32]: m8x32 | i8, u32 | test_v256 |
-+impl_m!([m8; 32]: m8x32 | i8 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From:  |
-         /// A 256-bit vector mask with 32 `m8` lanes.
- );
- 
--impl_i!([i16; 16]: i16x16, m16x16 | i16, u16 | test_v256 |
-+impl_i!([i16; 16]: i16x16, m16x16 | i16 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: i8x16, u8x16 |
-         /// A 256-bit vector with 16 `i16` lanes.
- );
--impl_u!([u16; 16]: u16x16, m16x16 | u16, u16 | test_v256 |
-+impl_u!([u16; 16]: u16x16, m16x16 | u16 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: u8x16 |
-         /// A 256-bit vector with 16 `u16` lanes.
- );
--impl_m!([m16; 16]: m16x16 | i16, u16 | test_v256 |
-+impl_m!([m16; 16]: m16x16 | i16 | test_v256 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: m8x16 |
-         /// A 256-bit vector mask with 16 `m16` lanes.
- );
- 
--impl_i!([i32; 8]: i32x8, m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7  |
-+impl_i!([i32; 8]: i32x8, m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7  |
-         From: i8x8, u8x8, i16x8, u16x8 |
-         /// A 256-bit vector with 8 `i32` lanes.
- );
--impl_u!([u32; 8]: u32x8, m32x8 | u32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_u!([u32; 8]: u32x8, m32x8 | u32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: u8x8, u16x8 |
-         /// A 256-bit vector with 8 `u32` lanes.
- );
-@@ -50,16 +50,16 @@ impl_f!([f32; 8]: f32x8, m32x8 | f32 | test_v256 | x0,
-         From: i8x8, u8x8, i16x8, u16x8 |
-         /// A 256-bit vector with 8 `f32` lanes.
- );
--impl_m!([m32; 8]: m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_m!([m32; 8]: m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: m8x8, m16x8 |
-         /// A 256-bit vector mask with 8 `m32` lanes.
- );
- 
--impl_i!([i64; 4]: i64x4, m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 |
-+impl_i!([i64; 4]: i64x4, m64x4 | i64 | test_v256 | x0, x1, x2, x3 |
-         From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4 |
-         /// A 256-bit vector with 4 `i64` lanes.
- );
--impl_u!([u64; 4]: u64x4, m64x4 | u64, u8 | test_v256 | x0, x1, x2, x3 |
-+impl_u!([u64; 4]: u64x4, m64x4 | u64 | test_v256 | x0, x1, x2, x3 |
-         From: u8x4, u16x4, u32x4 |
-         /// A 256-bit vector with 4 `u64` lanes.
- );
-@@ -67,20 +67,20 @@ impl_f!([f64; 4]: f64x4, m64x4 | f64 | test_v256 | x0,
-         From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, f32x4 |
-         /// A 256-bit vector with 4 `f64` lanes.
- );
--impl_m!([m64; 4]: m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 |
-+impl_m!([m64; 4]: m64x4 | i64 | test_v256 | x0, x1, x2, x3 |
-         From: m8x4, m16x4, m32x4 |
-         /// A 256-bit vector mask with 4 `m64` lanes.
- );
- 
--impl_i!([i128; 2]: i128x2, m128x2 | i128, u8 | test_v256 | x0, x1 |
-+impl_i!([i128; 2]: i128x2, m128x2 | i128 | test_v256 | x0, x1 |
-         From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, i64x2, u64x2 |
-         /// A 256-bit vector with 2 `i128` lanes.
- );
--impl_u!([u128; 2]: u128x2, m128x2 | u128, u8 | test_v256 | x0, x1 |
-+impl_u!([u128; 2]: u128x2, m128x2 | u128 | test_v256 | x0, x1 |
-         From: u8x2, u16x2, u32x2, u64x2 |
-         /// A 256-bit vector with 2 `u128` lanes.
- );
--impl_m!([m128; 2]: m128x2 | i128, u8 | test_v256 | x0, x1 |
-+impl_m!([m128; 2]: m128x2 | i128 | test_v256 | x0, x1 |
-         From: m8x2, m16x2, m32x2, m64x2 |
-         /// A 256-bit vector mask with 2 `m128` lanes.
- );
---- cargo-crates/packed_simd-0.3.3/src/v32.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v32.rs
-@@ -2,28 +2,28 @@
- 
- use crate::*;
- 
--impl_i!([i8; 4]: i8x4, m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 |
-+impl_i!([i8; 4]: i8x4, m8x4 | i8 | test_v32 | x0, x1, x2, x3 |
-         From: |
-         /// A 32-bit vector with 4 `i8` lanes.
- );
--impl_u!([u8; 4]: u8x4, m8x4 | u8, u8 | test_v32 | x0, x1, x2, x3 |
-+impl_u!([u8; 4]: u8x4, m8x4 | u8 | test_v32 | x0, x1, x2, x3 |
-         From: |
-         /// A 32-bit vector with 4 `u8` lanes.
- );
--impl_m!([m8; 4]: m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 |
-+impl_m!([m8; 4]: m8x4 | i8 | test_v32 | x0, x1, x2, x3 |
-         From: m16x4, m32x4, m64x4 |
-         /// A 32-bit vector mask with 4 `m8` lanes.
- );
- 
--impl_i!([i16; 2]: i16x2, m16x2 | i16, u8 | test_v32 | x0, x1 |
-+impl_i!([i16; 2]: i16x2, m16x2 | i16 | test_v32 | x0, x1 |
-         From: i8x2, u8x2 |
-         /// A 32-bit vector with 2 `i16` lanes.
- );
--impl_u!([u16; 2]: u16x2, m16x2 | u16, u8 | test_v32 | x0, x1 |
-+impl_u!([u16; 2]: u16x2, m16x2 | u16 | test_v32 | x0, x1 |
-         From: u8x2 |
-         /// A 32-bit vector with 2 `u16` lanes.
- );
--impl_m!([m16; 2]: m16x2 | i16, u8 | test_v32 | x0, x1 |
-+impl_m!([m16; 2]: m16x2 | i16 | test_v32 | x0, x1 |
-         From: m8x2, m32x2, m64x2, m128x2 |
-         /// A 32-bit vector mask with 2 `m16` lanes.
- );
---- cargo-crates/packed_simd-0.3.3/src/v512.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v512.rs
-@@ -3,7 +3,7 @@
- 
- use crate::*;
- 
--impl_i!([i8; 64]: i8x64, m8x64 | i8, u64 | test_v512 |
-+impl_i!([i8; 64]: i8x64, m8x64 | i8 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
-         x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
-@@ -11,7 +11,7 @@ impl_i!([i8; 64]: i8x64, m8x64 | i8, u64 | test_v512 |
-         From: |
-         /// A 512-bit vector with 64 `i8` lanes.
- );
--impl_u!([u8; 64]: u8x64, m8x64 | u8, u64 | test_v512 |
-+impl_u!([u8; 64]: u8x64, m8x64 | u8 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
-         x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
-@@ -19,7 +19,7 @@ impl_u!([u8; 64]: u8x64, m8x64 | u8, u64 | test_v512 |
-         From: |
-         /// A 512-bit vector with 64 `u8` lanes.
- );
--impl_m!([m8; 64]: m8x64 | i8, u64 | test_v512 |
-+impl_m!([m8; 64]: m8x64 | i8 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
-         x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
-@@ -28,31 +28,31 @@ impl_m!([m8; 64]: m8x64 | i8, u64 | test_v512 |
-         /// A 512-bit vector mask with 64 `m8` lanes.
- );
- 
--impl_i!([i16; 32]: i16x32, m16x32 | i16, u32 | test_v512 |
-+impl_i!([i16; 32]: i16x32, m16x32 | i16 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From: i8x32, u8x32 |
-         /// A 512-bit vector with 32 `i16` lanes.
- );
--impl_u!([u16; 32]: u16x32, m16x32 | u16, u32 | test_v512 |
-+impl_u!([u16; 32]: u16x32, m16x32 | u16 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From: u8x32 |
-         /// A 512-bit vector with 32 `u16` lanes.
- );
--impl_m!([m16; 32]: m16x32 | i16, u32 | test_v512 |
-+impl_m!([m16; 32]: m16x32 | i16 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
-         x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
-         From: m8x32 |
-         /// A 512-bit vector mask with 32 `m16` lanes.
- );
- 
--impl_i!([i32; 16]: i32x16, m32x16 | i32, u16 | test_v512 |
-+impl_i!([i32; 16]: i32x16, m32x16 | i32 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: i8x16, u8x16, i16x16, u16x16 |
-         /// A 512-bit vector with 16 `i32` lanes.
- );
--impl_u!([u32; 16]: u32x16, m32x16 | u32, u16 | test_v512 |
-+impl_u!([u32; 16]: u32x16, m32x16 | u32 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: u8x16, u16x16 |
-         /// A 512-bit vector with 16 `u32` lanes.
-@@ -62,17 +62,17 @@ impl_f!([f32; 16]: f32x16, m32x16 | f32 | test_v512 |
-         From: i8x16, u8x16, i16x16, u16x16 |
-         /// A 512-bit vector with 16 `f32` lanes.
- );
--impl_m!([m32; 16]: m32x16 | i32, u16 | test_v512 |
-+impl_m!([m32; 16]: m32x16 | i32 | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
-         From: m8x16, m16x16 |
-         /// A 512-bit vector mask with 16 `m32` lanes.
- );
- 
--impl_i!([i64; 8]: i64x8, m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_i!([i64; 8]: i64x8, m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8 |
-         /// A 512-bit vector with 8 `i64` lanes.
- );
--impl_u!([u64; 8]: u64x8, m64x8 | u64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_u!([u64; 8]: u64x8, m64x8 | u64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: u8x8, u16x8, u32x8 |
-         /// A 512-bit vector with 8 `u64` lanes.
- );
-@@ -80,20 +80,20 @@ impl_f!([f64; 8]: f64x8, m64x8 | f64 | test_v512 | x0,
-         From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8, f32x8 |
-         /// A 512-bit vector with 8 `f64` lanes.
- );
--impl_m!([m64; 8]: m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_m!([m64; 8]: m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: m8x8, m16x8, m32x8 |
-         /// A 512-bit vector mask with 8 `m64` lanes.
- );
- 
--impl_i!([i128; 4]: i128x4, m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 |
-+impl_i!([i128; 4]: i128x4, m128x4 | i128 | test_v512 | x0, x1, x2, x3 |
-         From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, i64x4, u64x4 |
-         /// A 512-bit vector with 4 `i128` lanes.
- );
--impl_u!([u128; 4]: u128x4, m128x4 | u128, u8 | test_v512 | x0, x1, x2, x3 |
-+impl_u!([u128; 4]: u128x4, m128x4 | u128 | test_v512 | x0, x1, x2, x3 |
-         From: u8x4, u16x4, u32x4, u64x4 |
-         /// A 512-bit vector with 4 `u128` lanes.
- );
--impl_m!([m128; 4]: m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 |
-+impl_m!([m128; 4]: m128x4 | i128 | test_v512 | x0, x1, x2, x3 |
-         From: m8x4, m16x4, m32x4, m64x4 |
-         /// A 512-bit vector mask with 4 `m128` lanes.
- );
---- cargo-crates/packed_simd-0.3.3/src/v64.rs.orig	2019-02-05 20:18:53 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/v64.rs
-@@ -3,41 +3,41 @@
- 
- use super::*;
- 
--impl_i!([i8; 8]: i8x8, m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_i!([i8; 8]: i8x8, m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: |
-         /// A 64-bit vector with 8 `i8` lanes.
- );
--impl_u!([u8; 8]: u8x8, m8x8 | u8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_u!([u8; 8]: u8x8, m8x8 | u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: |
-         /// A 64-bit vector with 8 `u8` lanes.
- );
--impl_m!([m8; 8]: m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-+impl_m!([m8; 8]: m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: m16x8, m32x8 |
-         /// A 64-bit vector mask with 8 `m8` lanes.
- );
- 
--impl_i!([i16; 4]: i16x4, m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 |
-+impl_i!([i16; 4]: i16x4, m16x4 | i16 | test_v64 | x0, x1, x2, x3 |
-         From: i8x4, u8x4 |
-         /// A 64-bit vector with 4 `i16` lanes.
- );
--impl_u!([u16; 4]: u16x4, m16x4 | u16, u8 | test_v64 | x0, x1, x2, x3 |
-+impl_u!([u16; 4]: u16x4, m16x4 | u16 | test_v64 | x0, x1, x2, x3 |
-         From: u8x4 |
-         /// A 64-bit vector with 4 `u16` lanes.
- );
--impl_m!([m16; 4]: m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 |
-+impl_m!([m16; 4]: m16x4 | i16 | test_v64 | x0, x1, x2, x3 |
-         From: m8x4, m32x4, m64x4 |
-         /// A 64-bit vector mask with 4 `m16` lanes.
- );
- 
--impl_i!([i32; 2]: i32x2, m32x2 | i32, u8 | test_v64 | x0, x1 |
-+impl_i!([i32; 2]: i32x2, m32x2 | i32 | test_v64 | x0, x1 |
-         From: i8x2, u8x2, i16x2, u16x2 |
-         /// A 64-bit vector with 2 `i32` lanes.
- );
--impl_u!([u32; 2]: u32x2, m32x2 | u32, u8 | test_v64 | x0, x1 |
-+impl_u!([u32; 2]: u32x2, m32x2 | u32 | test_v64 | x0, x1 |
-         From: u8x2, u16x2 |
-         /// A 64-bit vector with 2 `u32` lanes.
- );
--impl_m!([m32; 2]: m32x2 | i32, u8 | test_v64 | x0, x1 |
-+impl_m!([m32; 2]: m32x2 | i32 | test_v64 | x0, x1 |
-         From: m8x2, m16x2, m64x2, m128x2 |
-         /// A 64-bit vector mask with 2 `m32` lanes.
- );
-@@ -47,15 +47,15 @@ impl_f!([f32; 2]: f32x2, m32x2 | f32 | test_v64 | x0, 
- );
- 
- /*
--impl_i!([i64; 1]: i64x1, m64x1 | i64, u8 | test_v64 | x0 |
-+impl_i!([i64; 1]: i64x1, m64x1 | i64 | test_v64 | x0 |
-         From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1*/ |  // FIXME: primitive to vector conversion
-         /// A 64-bit vector with 1 `i64` lanes.
- );
--impl_u!([u64; 1]: u64x1, m64x1 | u64, u8 | test_v64 | x0 |
-+impl_u!([u64; 1]: u64x1, m64x1 | u64 | test_v64 | x0 |
-         From: /*u8x1, u16x1, u32x1*/ | // FIXME: primitive to vector conversion
-         /// A 64-bit vector with 1 `u64` lanes.
- );
--impl_m!([m64; 1]: m64x1 | i64, u8 | test_v64 | x0 |
-+impl_m!([m64; 1]: m64x1 | i64 | test_v64 | x0 |
-         From: /*m8x1, m16x1, m32x1, */ m128x1 | // FIXME: unary small vector types
-         /// A 64-bit vector mask with 1 `m64` lanes.
- );
---- cargo-crates/packed_simd-0.3.3/src/vSize.rs.orig	2019-01-31 22:44:03 UTC
-+++ cargo-crates/packed_simd-0.3.3/src/vSize.rs
-@@ -3,50 +3,50 @@
- use crate::codegen::pointer_sized_int::{isize_, usize_};
- use crate::*;
- 
--impl_i!([isize; 2]: isizex2, msizex2 | isize_, u8 | test_v128 |
-+impl_i!([isize; 2]: isizex2, msizex2 | isize_ | test_v128 |
-         x0, x1|
-         From: |
-         /// A vector with 2 `isize` lanes.
- );
- 
--impl_u!([usize; 2]: usizex2, msizex2 | usize_, u8 | test_v128 |
-+impl_u!([usize; 2]: usizex2, msizex2 | usize_ | test_v128 |
-         x0, x1|
-         From: |
-         /// A vector with 2 `usize` lanes.
- );
--impl_m!([msize; 2]: msizex2 | isize_, u8 | test_v128 |
-+impl_m!([msize; 2]: msizex2 | isize_ | test_v128 |
-         x0, x1 |
-         From: |
-         /// A vector mask with 2 `msize` lanes.
- );
- 
--impl_i!([isize; 4]: isizex4, msizex4 | isize_, u8 | test_v256 |
-+impl_i!([isize; 4]: isizex4, msizex4 | isize_ | test_v256 |
-         x0, x1, x2, x3 |
-         From: |
-         /// A vector with 4 `isize` lanes.
- );
--impl_u!([usize; 4]: usizex4, msizex4 | usize_, u8 | test_v256 |
-+impl_u!([usize; 4]: usizex4, msizex4 | usize_ | test_v256 |
-         x0, x1, x2, x3|
-         From: |
-         /// A vector with 4 `usize` lanes.
- );
--impl_m!([msize; 4]: msizex4 | isize_, u8 | test_v256 |
-+impl_m!([msize; 4]: msizex4 | isize_ | test_v256 |
-         x0, x1, x2, x3 |
-         From: |
-         /// A vector mask with 4 `msize` lanes.
- );
- 
--impl_i!([isize; 8]: isizex8, msizex8 | isize_, u8 | test_v512 |
-+impl_i!([isize; 8]: isizex8, msizex8 | isize_ | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: |
-         /// A vector with 4 `isize` lanes.
- );
--impl_u!([usize; 8]: usizex8, msizex8 | usize_, u8 | test_v512 |
-+impl_u!([usize; 8]: usizex8, msizex8 | usize_ | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: |
-         /// A vector with 8 `usize` lanes.
- );
--impl_m!([msize; 8]: msizex8 | isize_, u8 | test_v512 |
-+impl_m!([msize; 8]: msizex8 | isize_ | test_v512 |
-         x0, x1, x2, x3, x4, x5, x6, x7 |
-         From: |
-         /// A vector mask with 8 `msize` lanes.