build: bump MSRV from 1.78 to 1.84 (#1068)

* build: bump MSRV from 1.78 to 1.84

* build: upgrade nextest to handle link failure

* style: clippy uninlined_format_args, ptr_eq

* test: since it's cfg'd, don't use ignore

Author: morrisonlevi

.github/workflows/coverage.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
-          tool: [email protected],[email protected].81
+          tool: [email protected],[email protected].96
       - name: Generate code coverage (including doc tests)
         run: |
           cargo llvm-cov --all-features --workspace --no-report nextest

.github/workflows/lint.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust_version: ["1.78.0", "stable", "nightly-2024-12-16"]
+        rust_version: ["1.84.1", "stable", "nightly-2024-12-16"]
         platform: [windows-latest, ubuntu-latest]
     steps:
       - name: Checkout sources
@@ -48,7 +48,7 @@ jobs:
             export AWS_LC_FIPS_SYS_NO_ASM=1
           fi
           # shellcheck disable=SC2046
-          cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.78.0 ] || [ ${{ matrix.rust_version }} = stable ] && echo -Aunknown-lints -Ainvalid_reference_casting -Aclippy::redundant-closure-call)
+          cargo clippy --workspace --all-targets --all-features -- -D warnings 
 
   licensecheck:
     runs-on: ubuntu-latest

.github/workflows/miri.yml

@@ -21,7 +21,7 @@ jobs:
           rustup default nightly-2024-12-16
       - uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
-          tool: [email protected].92
+          tool: [email protected].96
       - run: MIRIFLAGS="-Zmiri-disable-isolation" cargo miri nextest run --partition count:${{ matrix.partition }}/5
       # We need to disable isolation because
       # "unsupported operation: `clock_gettime` with `REALTIME` clocks not available when isolation is enabled"

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Test
 on: [push]
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.78.0
+  RUST_VERSION: 1.84.1
 
 jobs:
   test:
@@ -44,7 +44,7 @@ jobs:
       - name: Install cargo nextest
         uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
-          tool: [email protected].81
+          tool: [email protected].96
       - name: "Remove nextest CI report"
         shell: bash
         run: rm -rf target/nextest/ci/junit.xml

.github/workflows/verify-proto-files.yml

@@ -5,7 +5,7 @@ on:
 
 env:
   DATADOG_AGENT_TAG: "7.55.0-rc.3"
-  rust_version: "1.78.0"
+  rust_version: "1.84.1"
 
 jobs:
   verify-proto-files:

.gitlab/benchmarks.yml

@@ -1,5 +1,5 @@
 variables:
-  BASE_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:libdatadog-benchmarks
+  BASE_CI_IMAGE: registry.ddbuild.io/ci/benchmarking-platform:libdatadog-benchmarks
   # The Dockerfile to this image is located at:
   # https://github.com/DataDog/benchmarking-platform/tree/libdatadog/benchmarks
 

Cargo.toml

@@ -45,7 +45,7 @@ members = [
   "datadog-log-ffi"
 ]
 
-# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
+# https://doc.rust-lang.org/cargo/reference/resolver.html
 resolver = "2"
 
 # These are used by many packages, but not all. For instance, the sidecar and
@@ -59,7 +59,7 @@ resolver = "2"
 # The RHEL restrictions are for the dd-trace-php repository. Someone in the
 # community, Remi Collet, packages the extension for these systems.
 [workspace.package]
-rust-version = "1.78.0"
+rust-version = "1.84.1"
 edition = "2021"
 version = "18.1.0"
 license = "Apache-2.0"

README.md

@@ -49,7 +49,7 @@ bash build-profiling-ffi.sh /opt/libdatadog
 
 #### Build dependencies
 
-- Rust 1.78.0 or newer with cargo. See the Cargo.toml for information about bumping this version.
+- Rust 1.84.1 or newer with cargo. See the Cargo.toml for information about bumping this version.
 - `cbindgen` 0.26
 - `cmake` and `protoc`
 
@@ -66,7 +66,7 @@ cargo nextest run
 The simplest way to install [cargo-nextest][nt] is to use `cargo install` like this.
 
 ```bash
-cargo install --locked '[email protected].85'
+cargo install --locked '[email protected].96'
 ```
 
 #### Dev Containers
@@ -110,6 +110,4 @@ Tracing integration tests require docker to be installed and running. If you don
 cargo nextest run -E '!test(tracing_integration_tests::)'
 ```
 
-Please note that the locked version is to make sure that it can be built using rust `1.78.0`, and if you are using a newer rust version, then it's enough to limit the version to `0.9.*`.
-
 [nt]: https://nexte.st/

datadog-alloc/src/virtual_alloc.rs

@@ -108,7 +108,7 @@ pub mod os {
             // akin to malloc.
             let result = unsafe { libc::mmap(null, len, prot, flags, -1, 0) };
 
-            if result == libc::MAP_FAILED {
+            if ptr::eq(result, libc::MAP_FAILED) {
                 return Err(AllocError);
             }
 

ddcommon-ffi/src/utils.rs

@@ -35,6 +35,6 @@ pub trait ToHexStr {
 
 impl ToHexStr for usize {
     fn to_hex_str(&self) -> String {
-        format!("0x{:X}", self)
+        format!("0x{self:X}")
     }
 }

ddcommon/src/hyper_migration.rs

@@ -50,9 +50,9 @@ pub enum Error {
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Error::Hyper(e) => write!(f, "hyper error: {}", e),
+            Error::Hyper(e) => write!(f, "hyper error: {e}"),
             Error::Infallible(e) => match *e {},
-            Error::Other(e) => write!(f, "other error: {}", e),
+            Error::Other(e) => write!(f, "other error: {e}"),
         }
     }
 }

local-linux.Dockerfile

@@ -47,9 +47,9 @@ WORKDIR /home/user
 # Install Rust toolchain for user in the usual ~/.cargo location
 # NOTE: Rust stable and nightly versions should be updated here whenever we bump the MSRV for libdatadog
 RUN su - user -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
-RUN su - user -c "cargo install --locked '[email protected].67'"
+RUN su - user -c "cargo install --locked '[email protected].96'"
 RUN su - user -c "rustup install nightly-2024-12-16"
-RUN su - user -c "bash -lc 'rustup default 1.78.0'"
+RUN su - user -c "bash -lc 'rustup default 1.84.1'"
 
 # Use a different target to not interfere with the host which may be a different arch
 RUN echo 'export CARGO_TARGET_DIR=/libdatadog/docker-linux-target' >> /home/user/.bashrc

tests/spawn_from_lib/tests/spawn.rs

@@ -15,10 +15,13 @@ fn rewind_and_read(file: &mut std::fs::File) -> anyhow::Result<String> {
     Ok(buf)
 }
 
-/// run with: RUSTFLAGS="-C prefer-dynamic" cargo test --package test_spawn_from_lib --features
-/// prefer-dynamic -- --ignored
+/// run with:
+/// ```bash
+/// RUSTFLAGS="-C prefer-dynamic" cargo test \
+///     --package test_spawn_from_lib \
+///     --features prefer-dynamic
+/// ```
 #[test]
-#[ignore = "requires -C prefer-dynamic"]
 #[cfg(feature = "prefer-dynamic")]
 fn test_spawning_trampoline_worker() {
     let mut stdout = tempfile::tempfile().unwrap();

tinybytes/src/lib.rs

@@ -130,15 +130,11 @@ impl Bytes {
 
         assert!(
             start <= end,
-            "range start must not be greater than end: {:?} > {:?}",
-            start,
-            end,
+            "range start must not be greater than end: {start:?} > {end:?}"
         );
         assert!(
             end <= len,
-            "range end must not be greater than length: {:?} > {:?}",
-            end,
-            len,
+            "range end must not be greater than length: {end:?} > {len:?}"
         );
 
         if end == start {

tools/docker/Dockerfile.build

@@ -1,4 +1,4 @@
-ARG ALPINE_BASE_IMAGE="alpine:3.20.3"
+ARG ALPINE_BASE_IMAGE="alpine:3.22.0"
 ARG CARGO_BUILD_INCREMENTAL="true"
 ARG CARGO_NET_RETRY="2"
 ARG BUILDER_IMAGE=debian_builder
@@ -7,7 +7,7 @@ ARG BUILDER_IMAGE=debian_builder
 FROM rust:1-slim-buster AS debian_builder
 ENV CARGO_HOME="/root/.cargo"
 WORKDIR /build
-RUN cargo install cbindgen; mv /root/.cargo/bin/cbindgen /usr/bin/; rm -rf /root/.cargo
+RUN cargo install cbindgen && mv /root/.cargo/bin/cbindgen /usr/bin/ && rm -rf /root/.cargo
 
 ### Debian buildplatform builder
 FROM --platform=$BUILDPLATFORM rust:1-slim-buster AS debian_builder_platform_native