Skip to content

Commit

Permalink
upgrade to rust 1.76.0 (#612)
Browse files Browse the repository at this point in the history
  • Loading branch information
duncanpharvey authored Sep 9, 2024
1 parent a82cd6c commit 00cf6dc
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fail-fast: false
matrix:
# Ignore nightly for now, it fails too often
rust_version: ["1.71.1", "stable"]
rust_version: ["1.76.0", "stable"]
platform: [windows-latest, ubuntu-latest]
steps:
- name: Checkout sources
Expand All @@ -46,7 +46,7 @@ jobs:
shell: bash
run: |
# shellcheck disable=SC2046
cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.71.1 ] && echo -Aunknown-lints -Aclippy::cast_ref_to_mut)
cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.76.0 ] && echo -Aunknown-lints -Ainvalid_reference_casting)
licensecheck:
runs-on: ubuntu-latest
name: "Presence of licence headers"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test
on: [push]
env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.71.1
RUST_VERSION: 1.76.0

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-proto-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

env:
DATADOG_AGENT_TAG: "7.55.0-rc.3"
rust_version: "1.71.1"
rust_version: "1.76.0"

jobs:
verify-proto-files:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ resolver = "2"
# serverless packages wanted to maintain their own version numbers. Some of
# their depenencies also remain under their own versioning.
[workspace.package]
rust-version = "1.71.1"
rust-version = "1.76.0"
edition = "2021"
version = "12.0.0"
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bash build-profiling-ffi.sh /opt/libdatadog

#### Build Dependencies

- Rust 1.71 or newer with cargo
- Rust 1.76.0 or newer with cargo
- `cbindgen` 0.26
- `cmake` and `protoc`

Expand Down Expand Up @@ -77,6 +77,6 @@ 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.71.1`, and if you are using a newer rust version, then it's enough to limit the version to `0.9.*`.
Please note that the locked version is to make sure that it can be built using rust `1.76.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/
8 changes: 4 additions & 4 deletions crashtracker-ffi/src/collector/spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub unsafe extern "C" fn ddog_crasht_clear_trace_ids() -> Result {
///
/// Note: 128 bit ints in FFI were not stabilized until Rust 1.77
/// https://blog.rust-lang.org/2024/03/30/i128-layout-update.html
/// We're currently locked into 1.71, have to do an ugly workaround involving 2 64 bit ints
/// We're currently locked into 1.76.0, have to do an ugly workaround involving 2 64 bit ints
/// until we can upgrade.
///
/// # Safety
Expand Down Expand Up @@ -80,7 +80,7 @@ pub unsafe extern "C" fn ddog_crasht_insert_trace_id(id_high: u64, id_low: u64)
///
/// Note: 128 bit ints in FFI were not stabilized until Rust 1.77
/// https://blog.rust-lang.org/2024/03/30/i128-layout-update.html
/// We're currently locked into 1.71, have to do an ugly workaround involving 2 64 bit ints
/// We're currently locked into 1.76.0, have to do an ugly workaround involving 2 64 bit ints
/// until we can upgrade.

///
Expand Down Expand Up @@ -110,7 +110,7 @@ pub unsafe extern "C" fn ddog_crasht_insert_span_id(id_high: u64, id_low: u64) -
///
/// Note: 128 bit ints in FFI were not stabilized until Rust 1.77
/// https://blog.rust-lang.org/2024/03/30/i128-layout-update.html
/// We're currently locked into 1.71, have to do an ugly workaround involving 2 64 bit ints
/// We're currently locked into 1.76.0, have to do an ugly workaround involving 2 64 bit ints
/// until we can upgrade.
///
/// # Safety
Expand Down Expand Up @@ -143,7 +143,7 @@ pub unsafe extern "C" fn ddog_crasht_remove_span_id(
///
/// Note: 128 bit ints in FFI were not stabilized until Rust 1.77
/// https://blog.rust-lang.org/2024/03/30/i128-layout-update.html
/// We're currently locked into 1.71, have to do an ugly workaround involving 2 64 bit ints
/// We're currently locked into 1.76.0, have to do an ugly workaround involving 2 64 bit ints
/// until we can upgrade.
///
/// # Safety
Expand Down
10 changes: 2 additions & 8 deletions tools/docker/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_BASE_IMAGE="alpine:3.18"
ARG ALPINE_BASE_IMAGE="alpine:3.19.3"
ARG CARGO_BUILD_INCREMENTAL="true"
ARG CARGO_NET_RETRY="2"
ARG BUILDER_IMAGE=debian_builder
Expand Down Expand Up @@ -44,13 +44,7 @@ SHELL ["/bin/bash", "-c"]
#RUN rustup-init -y --no-modify-path --default-toolchain stable

FROM alpine_base as alpine_aws_cli
RUN apk add --no-cache \
python3 \
py3-pip \
groff \
&& pip3 install --upgrade pip \
&& pip3 install --no-cache-dir \
awscli \
RUN apk add --no-cache aws-cli \
&& rm -rf /var/cache/apk/*

RUN aws --version # Just to make sure its installed alright
Expand Down

0 comments on commit 00cf6dc

Please sign in to comment.