Dependency updates

c/build.rs

@@ -1,5 +1,3 @@
-extern crate cbindgen;
-
 use std::env;
 
 fn main() {

selectors/Cargo.toml

@@ -9,6 +9,7 @@ readme = "README.md"
 keywords = ["css", "selectors"]
 license = "MPL-2.0"
 build = "build.rs"
+edition = "2021"
 
 [lib]
 name = "parcel_selectors"
@@ -24,14 +25,14 @@ serde = ["dep:serde", "smallvec/serde"]
 [dependencies]
 bitflags = "2.2.1"
 cssparser = "0.33.0"
-fxhash = "0.2"
+rustc-hash = "2"
 log = "0.4"
-phf = "0.10"
+phf = "0.11.2"
 precomputed-hash = "0.1"
 smallvec = "1.0"
 serde = { version = "1.0.201", features = ["derive"], optional = true }
 schemars = { version = "0.8.19", features = ["smallvec"], optional = true }
 static-self = { version = "0.1.0", path = "../static-self", optional = true }
 
 [build-dependencies]
-phf_codegen = "0.10"
+phf_codegen = "0.11"

selectors/bloom.rs

@@ -283,7 +283,7 @@ fn hash2(hash: u32) -> u32 {
 
 #[test]
 fn create_and_insert_some_stuff() {
-  use fxhash::FxHasher;
+  use rustc_hash::FxHasher;
   use std::hash::{Hash, Hasher};
   use std::mem::transmute;
 

selectors/build.rs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-extern crate phf_codegen;
-
 use std::env;
 use std::fs::File;
 use std::io::{BufWriter, Write};

selectors/lib.rs

@@ -9,18 +9,8 @@
 extern crate bitflags;
 #[macro_use]
 extern crate cssparser;
-extern crate fxhash;
 #[macro_use]
 extern crate log;
-extern crate phf;
-extern crate precomputed_hash;
-#[cfg(feature = "jsonschema")]
-extern crate schemars;
-#[cfg(feature = "serde")]
-extern crate serde;
-extern crate smallvec;
-#[cfg(feature = "into_owned")]
-extern crate static_self;
 
 pub mod attr;
 pub mod bloom;

selectors/matching.rs

@@ -60,7 +60,7 @@ impl ElementSelectorFlags {
 }
 
 /// Holds per-compound-selector data.
-struct LocalMatchingContext<'a, 'b: 'a, 'i, Impl: SelectorImpl<'i>> {
+struct LocalMatchingContext<'a, 'b, 'i, Impl: SelectorImpl<'i>> {
   shared: &'a mut MatchingContext<'b, 'i, Impl>,
   matches_hover_and_active_quirk: MatchesHoverAndActiveQuirk,
 }

selectors/nth_index_cache.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use crate::tree::OpaqueElement;
-use fxhash::FxHashMap;
+use rustc_hash::FxHashMap;
 
 /// A cache to speed up matching of nth-index-like selectors.
 ///

selectors/parser.rs

@@ -1008,7 +1008,7 @@ impl<'i, Impl: SelectorImpl<'i>> From<Vec<Component<'i, Impl>>> for Selector<'i,
 }
 
 #[derive(Clone)]
-pub struct SelectorIter<'a, 'i, Impl: 'a + SelectorImpl<'i>> {
+pub struct SelectorIter<'a, 'i, Impl: SelectorImpl<'i>> {
   iter: slice::Iter<'a, Component<'i, Impl>>,
   next_combinator: Option<Combinator>,
 }
@@ -1091,7 +1091,7 @@ impl<'a, 'i, Impl: SelectorImpl<'i>> fmt::Debug for SelectorIter<'a, 'i, Impl> {
 }
 
 /// An iterator over all simple selectors belonging to ancestors.
-struct AncestorIter<'a, 'i, Impl: 'a + SelectorImpl<'i>>(SelectorIter<'a, 'i, Impl>);
+struct AncestorIter<'a, 'i, Impl: SelectorImpl<'i>>(SelectorIter<'a, 'i, Impl>);
 impl<'a, 'i, Impl: 'a + SelectorImpl<'i>> AncestorIter<'a, 'i, Impl> {
   /// Creates an AncestorIter. The passed-in iterator is assumed to point to
   /// the beginning of the child sequence, which will be skipped.