Skip to content

Commit c738d3c

Browse files
authored
Fix CI nits ✅ (AFLplusplus#3475)
* Un-shared * Fix all the rest * more just? * more * more fix * nau?
1 parent 2f39ba9 commit c738d3c

File tree

13 files changed

+20
-35
lines changed

13 files changed

+20
-35
lines changed

.github/workflows/asan-prepare/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ runs:
4545
wget
4646
- uses: dtolnay/rust-toolchain@stable
4747
- name: install just
48-
uses: extractions/setup-just@v2
49-
with:
50-
just-version: '1.40.0'
48+
uses: extractions/setup-just@v3
5149
- name: Install cargo-binstall
5250
shell: bash
5351
run: |

.github/workflows/fuzzer-tester-prepare/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ runs:
3232
shell: bash
3333
run: sudo apt update && sudo apt install -y libgtk-3-dev pax-utils python3-msgpack python3-jinja2 libcapstone-dev
3434
- name: install just
35-
uses: extractions/setup-just@v2
36-
with:
37-
just-version: '1.40.0'
35+
uses: extractions/setup-just@v3
3836
- name: Add wasm target
3937
if: ${{ inputs.fuzzer-name == 'fuzz_anything/baby_fuzzer_wasm' }}
4038
shell: bash

.github/workflows/qemu-fuzzer-tester-prepare/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ runs:
1717
shell: bash
1818
run: export MAKEFLAGS="-j$(expr $(nproc) \+ 1)"
1919
- name: install just
20-
uses: extractions/setup-just@v2
21-
with:
22-
just-version: '1.40.0'
20+
uses: extractions/setup-just@v3
2321
- uses: actions/checkout@v4
2422
with:
2523
submodules: true

.github/workflows/ubuntu-prepare/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ runs:
4040
# -----------------------------------------
4141

4242
- name: Install just
43-
uses: extractions/setup-just@v2
44-
with:
45-
just-version: '1.40.0'
43+
uses: extractions/setup-just@v3
4644

4745
- uses: taiki-e/install-action@cargo-hack
4846

.github/workflows/windows-tester-prepare/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ runs:
1616
shell: pwsh
1717
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
1818
- name: install just
19-
uses: extractions/setup-just@v2
20-
with:
21-
just-version: '1.40.0'
19+
uses: extractions/setup-just@v3

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.2
2-
FROM rust:1.87.0 AS libafl
2+
FROM rust:1.91.0 AS libafl
33
LABEL "maintainer"="afl++ team <afl@aflplus.plus>"
44
LABEL "about"="LibAFL Docker image"
55

@@ -63,7 +63,6 @@ RUN apt-get update && \
6363
python3 \
6464
python3-pip \
6565
python3-venv \
66-
software-properties-common \
6766
ca-certificates \
6867
wget
6968
RUN set -ex &&\

crates/libafl/src/executors/command.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl CommandConfigurator<Child> for StdCommandConfigurator {
215215

216216
/// Linux specific [`CommandConfigurator`] that leverages `ptrace`
217217
///
218-
/// This configurator was primarly developed to be used in conjunction with
218+
/// This configurator was primarily developed to be used in conjunction with
219219
/// [`crate::executors::hooks::intel_pt::IntelPTHook`]
220220
#[cfg(all(feature = "intel_pt", target_os = "linux"))]
221221
#[derive(Debug, Clone, PartialEq, Eq, TypedBuilder)]
@@ -305,7 +305,7 @@ impl CommandConfigurator<Pid> for PTraceCommandConfigurator {
305305
Duration::from_secs(u64::from(self.timeout))
306306
}
307307

308-
/// Use [`PTraceCommandConfigurator::builder().timeout`] instead
308+
/// Use [`PTraceCommandConfigurator::builder()`](PTraceCommandConfigurator) instead
309309
fn exec_timeout_mut(&mut self) -> &mut Duration {
310310
unimplemented!("Use [`PTraceCommandConfigurator::builder().timeout`] instead")
311311
}

crates/libafl_bolts/src/anymap.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
use core::{any::TypeId, mem::size_of, ptr::read_unaligned};
44

5-
/// Get a `type_id` from its previously unpacked `u128`.
6-
/// Opposite of [`unpack_type_id(id)`].
5+
/// Get a [`TypeId`] from its previously unpacked `u128`.
6+
/// Opposite of [`unpack_type_id`].
77
///
88
/// # Note
99
/// Probably not safe for future compilers, fine for now.
@@ -16,8 +16,8 @@ pub const fn pack_type_id(id: u128) -> TypeId {
1616
unsafe { *(&raw const id as *const TypeId) }
1717
}
1818

19-
/// Unpack a `type_id` to an `u128`
20-
/// Opposite of [`pack_type_id(id)`].
19+
/// Unpack a [`TypeId`] to an `u128`
20+
/// Opposite of [`pack_type_id`].
2121
///
2222
/// # Note
2323
/// Probably not safe for future compilers, fine for now.

crates/libafl_bolts/src/llmp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ where
13261326
}
13271327

13281328
/// Create this client on an existing map from the given description.
1329-
/// Acquired with [`self.describe`].
1329+
/// Acquired with [`LlmpSender::describe`].
13301330
pub fn on_existing_from_description(
13311331
mut shmem_provider: SP,
13321332
description: &LlmpDescription,
@@ -3005,7 +3005,7 @@ where
30053005
}
30063006

30073007
/// Registers a new client for the given sharedmap str and size.
3008-
/// Returns the id of the new client in [`broker.client_shmem`]
3008+
/// Returns the [`ClientId`] of the newly registered client.
30093009
pub fn register_client(&mut self, mut client_page: LlmpSharedMap<SHM>) -> ClientId {
30103010
// Tell the client it may unmap its initial allocated shmem page now.
30113011
// Since we now have a handle to it, it won't be umapped too early (only after we also unmap it)
@@ -3614,7 +3614,7 @@ where
36143614
})
36153615
}
36163616

3617-
/// Recreate this client from a previous [`client.to_env()`]
3617+
/// Recreate this client from a previous [`LlmpClient::to_env`]
36183618
#[cfg(feature = "std")]
36193619
pub fn on_existing_from_env(shmem_provider: SP, env_name: &str) -> Result<Self, Error> {
36203620
Ok(Self {

crates/libafl_bolts/src/target_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub enum InputLocation {
2424
input_file: Option<InputFile>,
2525
},
2626
/// Deliver the input via the specified [`InputFile`]
27-
/// You can use specify [`InputFile::create(INPUTFILE_STD)`] to use a default filename.
27+
/// You can use [`InputFile::create`] with [`crate::fs::INPUTFILE_STD`] to use a default filename.
2828
File {
2929
/// The file to write input to. The target should read input from this location.
3030
out_file: InputFile,

0 commit comments

Comments
 (0)