Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c5b70f0

Browse files
committedFeb 13, 2025
make std feature conflict with hashbrown in compile error
1 parent 4c45a01 commit c5b70f0

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed
 

‎src/allocator/free_list_allocator/mod.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ use alloc::{
55
string::{String, ToString},
66
vec::Vec,
77
};
8-
#[cfg(all(feature = "std", not(feature = "hashbrown")))]
9-
use std::collections::{HashMap, HashSet};
8+
109
#[cfg(feature = "std")]
11-
use std::{backtrace::Backtrace, sync::Arc};
10+
use std::{
11+
backtrace::Backtrace,
12+
collections::{HashMap, HashSet},
13+
sync::Arc,
14+
};
1215

13-
#[cfg(all(not(feature = "std"), feature = "hashbrown"))]
16+
#[cfg(feature = "hashbrown")]
1417
use hashbrown::{HashMap, HashSet};
1518
use log::{log, Level};
1619

‎src/allocator/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ use crate::result::*;
1010
pub(crate) mod dedicated_block_allocator;
1111
pub(crate) use dedicated_block_allocator::DedicatedBlockAllocator;
1212

13+
#[cfg(any(feature = "std", feature = "hashbrown"))]
1314
pub(crate) mod free_list_allocator;
15+
#[cfg(any(feature = "std", feature = "hashbrown"))]
1416
pub(crate) use free_list_allocator::FreeListAllocator;
1517

1618
#[derive(PartialEq, Copy, Clone, Debug)]

‎src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@
222222
#[macro_use]
223223
extern crate alloc;
224224

225-
#[cfg(all(not(feature = "std"), not(feature = "hashbrown")))]
226-
compile_error!("\"hashbrown\" feature should be enabled in \"no_std\" environment.");
225+
#[cfg(all(feature = "std", feature = "hashbrown"))]
226+
compile_error!("\"hashbrown\" feature should not be enabled in \"std\" environment.");
227227

228228
#[cfg(all(not(feature = "std"), feature = "visualizer"))]
229229
compile_error!("Cannot enable \"visualizer\" feature in \"no_std\" environment.");

0 commit comments

Comments
 (0)
Please sign in to comment.