bitintr is incompatible with newer rust

Cargo.toml

@@ -5,7 +5,6 @@ version = "0.2.0"
 authors = ["prime <prime@kmc.gr.jp>"]
 
 [dependencies]
-bitintr = "0.3"
 lazy_static = "1.4"
 rand = { version = "0.8", features = ["small_rng"] }
 rand_xoshiro = "0.6"

src/engine/bits.rs

@@ -1,4 +1,4 @@
-use bitintr::{Pdep, Pext};
+use core::arch::x86_64::{_pdep_u64, _pext_u64};
 use lazy_static::lazy_static;
 
 pub fn popcnt(x: u64) -> i8 {
@@ -45,12 +45,12 @@ pub fn mirror_under_8(mut x: u64) -> u64 {
 }
 
 pub fn pext(x: u64, mask: u64) -> u64 {
-    x.pext(mask)
+    unsafe { _pext_u64(x, mask) }
 }
 
 #[allow(dead_code)]
 pub fn pdep(x: u64, mask: u64) -> u64 {
-    x.pdep(mask)
+    unsafe { _pdep_u64(x, mask) }
 }
 
 lazy_static! {

src/engine/endgame.rs

@@ -6,7 +6,7 @@ use crate::engine::hand::*;
 use crate::engine::search::*;
 use crate::engine::table::*;
 use arrayvec::ArrayVec;
-use bitintr::Tzcnt;
+use core::arch::x86_64::_tzcnt_u64;
 use std::cmp::max;
 
 fn near_leaf(solve_obj: &mut SolveObj, board: Board) -> (i8, SolveStat) {
@@ -59,7 +59,7 @@ fn static_order(solve_obj: &mut SolveObj, board: Board, (mut alpha, beta): (i8,
     for mask in MASKS.iter() {
         let mut remain = mobility_bits & mask;
         while remain != 0 {
-            let pos = remain.tzcnt() as usize;
+            let pos = unsafe { _tzcnt_u64(remain) } as usize;
             remain = remain & (remain - 1);
             if let Some(next) = board.play(pos) {
                 pass = false;

src/engine/last_cache.rs

@@ -2,7 +2,7 @@
 mod test;
 use crate::engine::bits::*;
 use crate::engine::board::*;
-use bitintr::Tzcnt;
+use core::arch::x86_64::_tzcnt_u64;
 
 pub struct LastCache {
     table: [(i8, i8); 4096],
@@ -65,7 +65,7 @@ impl LastCache {
     }
 
     unsafe fn solve_last_impl(&self, board: Board) -> (i8, usize) {
-        let pos = board.empty().tzcnt() as usize;
+        let pos = _tzcnt_u64(board.empty()) as usize;
         let row = pos >> 3;
         let col = pos & 0b111;
         let row_bits = (board.player >> (row * 8)) & 0xff;

src/main.rs

@@ -1,5 +1,4 @@
 #![feature(test)]
-#![feature(stdsimd)]
 mod book;
 mod engine;
 mod play;