swap out xxhash-rust for twox-hash due to licensing issue

Author: Xaeroxe

Cargo.lock

@@ -4775,8 +4775,8 @@ dependencies = [
  "sha1",
  "sha2",
  "tracing",
+ "twox-hash",
  "unicode-width",
- "xxhash-rust",
 ]
 
 [[package]]
@@ -6621,12 +6621,6 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
 
-[[package]]
-name = "xxhash-rust"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
-
 [[package]]
 name = "xz2"
 version = "0.1.7"

compiler/rustc_span/Cargo.toml

@@ -18,6 +18,6 @@ scoped-tls = "1.0"
 sha1 = "0.10.0"
 sha2 = "0.10.1"
 tracing = "0.1"
+twox-hash = "1.6.3"
 unicode-width = "0.1.4"
-xxhash-rust = { version = "0.8.10", features = ["xxh3"] }
 # tidy-alphabetical-end

compiler/rustc_span/src/lib.rs

@@ -43,7 +43,7 @@ use rustc_macros::{Decodable, Encodable, HashStable_Generic};
 use rustc_serialize::opaque::{FileEncoder, MemDecoder};
 use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
 use tracing::debug;
-use xxhash_rust::xxh3;
+use twox_hash::xxh3::{self, HasherExt};
 
 mod caching_source_map_view;
 pub mod source_map;
@@ -78,7 +78,7 @@ use rustc_data_structures::sync::{FreezeLock, FreezeWriteGuard, Lock, Lrc};
 use std::borrow::Cow;
 use std::cmp::{self, Ordering};
 use std::fmt::Display;
-use std::hash::Hash;
+use std::hash::{Hash, Hasher};
 use std::io::{self, Read};
 use std::ops::{Add, Range, Sub};
 use std::path::{Path, PathBuf};
@@ -1531,7 +1531,7 @@ impl SourceFileHash {
                 value.copy_from_slice(&Sha256::digest(data));
             }
             SourceFileHashAlgorithm::XxHash => {
-                value.copy_from_slice(&xxh3::xxh3_128(data).to_be_bytes());
+                value.copy_from_slice(&xxh3::hash128(data).to_be_bytes());
             }
         };
         hash
@@ -1569,9 +1569,9 @@ impl SourceFileHash {
         match kind {
             SourceFileHashAlgorithm::XxHash => {
                 digest(
-                    xxh3::Xxh3::new(),
-                    |h, b| h.update(b),
-                    |h, out| out.copy_from_slice(&h.digest128().to_be_bytes()),
+                    xxh3::Hash128::default(),
+                    |h, b| h.write(b),
+                    |h, out| out.copy_from_slice(&h.finish_ext().to_be_bytes()),
                     src,
                     &mut buf,
                     value,