Skip to content

Commit 5bfa974

Browse files
committed
Merge remote-tracking branch 'origin/master' into capstone-5.0.6
2 parents 46f96e9 + 0eeff9a commit 5bfa974

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
freebsd_instance:
2-
image_family: freebsd-14-0
2+
image_family: freebsd-14-2
33

44
test_task:
55
env:

capstone-rs/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#[macro_use]
99
extern crate alloc;
1010

11-
#[cfg(any(test, not(feature = "std")))]
11+
#[cfg(all(test, not(feature = "std")))]
1212
#[macro_use]
1313
extern crate std;
1414

15-
#[cfg(any(test, not(feature = "std")))]
15+
#[cfg(all(test, not(feature = "std")))]
1616
#[global_allocator]
1717
static ALLOCATOR: std::alloc::System = std::alloc::System;
1818

0 commit comments

Comments
 (0)