From 04323227f4819ce23f5954dcb44c704805b6f126 Mon Sep 17 00:00:00 2001 From: Camille Gillot Date: Mon, 13 Oct 2025 18:15:25 +0000 Subject: [PATCH] Use regular Vec in BitSet. --- compiler/rustc_index/src/bit_set.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/rustc_index/src/bit_set.rs b/compiler/rustc_index/src/bit_set.rs index f7649c5f5c55e..022dbdffc69c3 100644 --- a/compiler/rustc_index/src/bit_set.rs +++ b/compiler/rustc_index/src/bit_set.rs @@ -8,7 +8,6 @@ use std::{fmt, iter, slice}; use Chunk::*; #[cfg(feature = "nightly")] use rustc_macros::{Decodable_NoContext, Encodable_NoContext}; -use smallvec::{SmallVec, smallvec}; use crate::{Idx, IndexVec}; @@ -118,7 +117,7 @@ macro_rules! bit_relations_inherent_impls { #[derive(Eq, PartialEq, Hash)] pub struct DenseBitSet { domain_size: usize, - words: SmallVec<[Word; 2]>, + words: Vec, marker: PhantomData, } @@ -134,7 +133,7 @@ impl DenseBitSet { #[inline] pub fn new_empty(domain_size: usize) -> DenseBitSet { let num_words = num_words(domain_size); - DenseBitSet { domain_size, words: smallvec![0; num_words], marker: PhantomData } + DenseBitSet { domain_size, words: vec![0; num_words], marker: PhantomData } } /// Creates a new, filled bitset with a given `domain_size`. @@ -142,7 +141,7 @@ impl DenseBitSet { pub fn new_filled(domain_size: usize) -> DenseBitSet { let num_words = num_words(domain_size); let mut result = - DenseBitSet { domain_size, words: smallvec![!0; num_words], marker: PhantomData }; + DenseBitSet { domain_size, words: vec![!0; num_words], marker: PhantomData }; result.clear_excess_bits(); result } @@ -1442,7 +1441,7 @@ impl From> for GrowableBitSet { pub struct BitMatrix { num_rows: usize, num_columns: usize, - words: SmallVec<[Word; 2]>, + words: Vec, marker: PhantomData<(R, C)>, } @@ -1455,7 +1454,7 @@ impl BitMatrix { BitMatrix { num_rows, num_columns, - words: smallvec![0; num_rows * words_per_row], + words: vec![0; num_rows * words_per_row], marker: PhantomData, } }