Skip to content

Commit 9b58c2a

Browse files
committed
Require threads on all platforms.
1 parent 893c1a9 commit 9b58c2a

File tree

6 files changed

+8
-91
lines changed

6 files changed

+8
-91
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
## Breaking Changes
2525

26+
* #1399 Thread support is now required on all platforms.
2627
* #1135 The "no_metrics" anti-feature has been replaced with
2728
the "metrics" positive feature.
2829
* #1178 the `Event` enum has become a unified struct that allows

src/context.rs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,7 @@ pub struct Context {
1212
/// When the last high-level reference is dropped, it
1313
/// should trigger all background threads to clean
1414
/// up synchronously.
15-
#[cfg(all(
16-
not(miri),
17-
any(
18-
windows,
19-
target_os = "linux",
20-
target_os = "macos",
21-
target_os = "dragonfly",
22-
target_os = "freebsd",
23-
target_os = "openbsd",
24-
target_os = "netbsd",
25-
target_os = "ios",
26-
)
27-
))]
15+
#[cfg(not(miri))]
2816
pub(crate) flusher: Arc<Mutex<Option<flusher::Flusher>>>,
2917
#[doc(hidden)]
3018
pub pagecache: PageCache,
@@ -47,19 +35,7 @@ impl Context {
4735
Ok(Self {
4836
config,
4937
pagecache,
50-
#[cfg(all(
51-
not(miri),
52-
any(
53-
windows,
54-
target_os = "linux",
55-
target_os = "macos",
56-
target_os = "dragonfly",
57-
target_os = "freebsd",
58-
target_os = "openbsd",
59-
target_os = "netbsd",
60-
target_os = "ios",
61-
)
62-
))]
38+
#[cfg(not(miri))]
6339
flusher: Arc::new(parking_lot::Mutex::new(None)),
6440
})
6541
}

src/db.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,7 @@ impl Db {
5353

5454
let context = Context::start(config)?;
5555

56-
#[cfg(all(
57-
not(miri),
58-
any(
59-
windows,
60-
target_os = "linux",
61-
target_os = "macos",
62-
target_os = "dragonfly",
63-
target_os = "freebsd",
64-
target_os = "openbsd",
65-
target_os = "netbsd",
66-
target_os = "ios",
67-
)
68-
))]
56+
#[cfg(not(miri))]
6957
{
7058
let flusher_pagecache = context.pagecache.clone();
7159
let flusher = context.flush_every_ms.map(move |fem| {

src/lib.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,7 @@ pub mod fail;
225225
#[cfg(feature = "docs")]
226226
pub mod doc;
227227

228-
#[cfg(all(
229-
not(miri),
230-
any(
231-
windows,
232-
target_os = "linux",
233-
target_os = "macos",
234-
target_os = "dragonfly",
235-
target_os = "freebsd",
236-
target_os = "openbsd",
237-
target_os = "netbsd",
238-
target_os = "ios",
239-
)
240-
))]
228+
#[cfg(not(miri))]
241229
mod flusher;
242230

243231
#[cfg(feature = "event_log")]

src/pagecache/mod.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,19 +1100,7 @@ impl PageCacheInner {
11001100
/// move a page. Returns Ok(false) if there were no pages
11011101
/// to GC. Returns an Err if we encountered an IO problem
11021102
/// while performing this GC.
1103-
#[cfg(all(
1104-
not(miri),
1105-
any(
1106-
windows,
1107-
target_os = "linux",
1108-
target_os = "macos",
1109-
target_os = "dragonfly",
1110-
target_os = "freebsd",
1111-
target_os = "openbsd",
1112-
target_os = "netbsd",
1113-
target_os = "ios",
1114-
)
1115-
))]
1103+
#[cfg(not(miri))]
11161104
pub(crate) fn attempt_gc(&self) -> Result<bool> {
11171105
let guard = pin();
11181106
let cc = concurrency_control::read();

src/threadpool.rs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,7 @@ use std::sync::Arc;
44

55
use crate::{OneShot, Result};
66

7-
#[cfg(all(
8-
not(miri),
9-
any(
10-
windows,
11-
target_os = "linux",
12-
target_os = "macos",
13-
target_os = "dragonfly",
14-
target_os = "freebsd",
15-
target_os = "openbsd",
16-
target_os = "netbsd",
17-
target_os = "ios",
18-
)
19-
))]
7+
#[cfg(not(miri))]
208
mod queue {
219
use std::{
2210
cell::RefCell,
@@ -220,19 +208,7 @@ where
220208
spawn_to(work, &queue::BLOCKING_QUEUE)
221209
}
222210

223-
#[cfg(any(
224-
miri,
225-
not(any(
226-
windows,
227-
target_os = "linux",
228-
target_os = "macos",
229-
target_os = "dragonfly",
230-
target_os = "freebsd",
231-
target_os = "openbsd",
232-
target_os = "netbsd",
233-
target_os = "ios",
234-
))
235-
))]
211+
#[cfg(miri)]
236212
mod queue {
237213
/// This is the polyfill that just executes things synchronously.
238214
use crate::{OneShot, Result};

0 commit comments

Comments
 (0)