Skip to content

Commit 7682acc

Browse files
committed
make log an optional dependency
1 parent e31225d commit 7682acc

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.github/workflows/test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- run: sudo sysctl -w ${{ matrix.sysctl }}
2424
- run: rustup default ${{ matrix.toolchain }}
2525
- run: cargo test --locked ${{ matrix.test_args }}
26+
- run: cargo test --locked --no-default-features ${{ matrix.test_args }}
2627
- run: cargo fmt -- --check
2728
if: ${{ matrix.toolchain == 'stable' }}
2829
- run: cargo clippy --locked --all-targets -- -D warnings

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1919

2020
### Changed
2121
- `SealedCommand` and `execute_sealed` set `F_SEAL_EXEC` on Linux 6.3 and newer
22+
- `log` is now an optional dependency (remains enabled by default)
2223
- Moved source repository to <https://github.com/haha-business/pentacle>
2324
- Minimum supported Rust version (MSRV) now 1.59.0
2425

Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ exclude = [".github", ".gitignore"]
1212

1313
[dependencies]
1414
libc = "0.2.153"
15-
log = "0.4.4"
15+
log = { version = "0.4.4", optional = true }
16+
17+
[features]
18+
default = ["log"]
1619

1720
[lints.rust.unexpected_cfgs]
1821
level = "warn"

src/syscall.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ use std::os::unix::io::{AsRawFd, FromRawFd};
1313
use libc::{
1414
c_char, c_int, c_long, c_uint, syscall, SYS_fcntl, SYS_memfd_create, F_ADD_SEALS, F_GET_SEALS,
1515
};
16-
use log::trace;
1716

1817
pub(crate) fn memfd_create(name: &CStr, flags: c_uint) -> Result<File> {
1918
let name: *const c_char = name.as_ptr();
2019
let retval = unsafe { syscall(SYS_memfd_create, name, flags) };
21-
trace!("memfd_create({:?}, {}) = {}", name, flags, retval);
20+
#[cfg(feature = "log")]
21+
log::trace!("memfd_create({:?}, {}) = {}", name, flags, retval);
2222
check_syscall(retval)?;
2323
Ok(unsafe { File::from_raw_fd(retval as c_int) })
2424
}
@@ -27,7 +27,8 @@ pub(crate) fn fcntl_get_seals(file: &File) -> Result<c_int> {
2727
let fd: c_int = file.as_raw_fd();
2828
let flag: c_int = F_GET_SEALS;
2929
let retval = unsafe { syscall(SYS_fcntl, fd, flag) };
30-
trace!("fcntl({}, {}) = {}", fd, flag, retval);
30+
#[cfg(feature = "log")]
31+
log::trace!("fcntl({}, {}) = {}", fd, flag, retval);
3132
check_syscall(retval)?;
3233
Ok(retval as c_int)
3334
}
@@ -36,7 +37,8 @@ pub(crate) fn fcntl_add_seals(file: &File, arg: c_int) -> Result<()> {
3637
let fd: c_int = file.as_raw_fd();
3738
let flag: c_int = F_ADD_SEALS;
3839
let retval = unsafe { syscall(SYS_fcntl, fd, flag, arg) };
39-
trace!("fcntl({}, {}, {}) = {}", fd, flag, arg, retval);
40+
#[cfg(feature = "log")]
41+
log::trace!("fcntl({}, {}, {}) = {}", fd, flag, arg, retval);
4042
check_syscall(retval)
4143
}
4244

0 commit comments

Comments
 (0)