chore(deps): Update Rust toolchain to 1.83.0 #22068

jszwedko · 2024-12-20T22:36:33Z

Summary

Updates the Rust toolchain to 1.83.0 (latest)

Change Type

Bug fix
New feature
Non-functional (chore, refactoring, docs)
Performance

Is this a breaking change?

Yes
No

How did you test this PR?

make check-clippy

Does this PR include user facing changes?

Yes. Please add a changelog fragment based on our guidelines.
No. A maintainer will apply the "no-changelog" label to this PR.

Checklist

Please read our Vector contributor resources.
If this PR introduces changes Vector dependencies (modifies Cargo.lock), please
run dd-rust-license-tool write to regenerate the license inventory and commit the changes (if any). More details here.

References

Signed-off-by: Jesse Szwedko <[email protected]>

…st-1.83

Signed-off-by: Jesse Szwedko <[email protected]>

pront

Thank you! This was a large one.

pront · 2025-01-02T14:43:11Z

lib/codecs/src/decoding/mod.rs

@@ -264,7 +264,6 @@ pub enum DeserializerConfig {
    ///
    /// Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
    /// the codec may continue to relax the enforcement of specification.
-


Nit: should this be ///?

Hmm, I don't think so. We want this to be a doc comment so that is extracted and rendered in the docs.

pront · 2025-01-02T14:43:47Z

lib/tracing-limit/benches/limit.rs

@@ -94,7 +94,7 @@ where

 struct Visitor<'a>(MutexGuard<'a, String>);

-impl<'a> field::Visit for Visitor<'a> {
+impl field::Visit for Visitor<'_> {


✨ nice readability improvement

Agreed. I forgot to leave some comments about the clippy changes, but this was one of them about it being unnecessary to specify lifetimes in some places.

pront · 2025-01-02T14:50:14Z

lib/vector-buffers/src/variants/disk_v2/common.rs

@@ -64,7 +64,7 @@ pub(crate) const fn align16(amount: usize) -> usize {
        "`amount` must be less than `MAX_ALIGNABLE_AMOUNT`"
    );

-    ((amount + SERIALIZER_ALIGNMENT - 1) / SERIALIZER_ALIGNMENT) * SERIALIZER_ALIGNMENT
+    amount.div_ceil(SERIALIZER_ALIGNMENT) * SERIALIZER_ALIGNMENT


Note (no action need): interesting change, should be covered by existing tests.

Mmm, yeah, I didn't even notice this one since clippy --fix did it.

pront · 2025-01-02T14:51:35Z

lib/vector-core/src/config/global_options.rs

@@ -239,7 +242,7 @@ impl GlobalOptions {
    }
 }

-fn conflicts<T: PartialEq>(this: &Option<T>, that: &Option<T>) -> bool {
+fn conflicts<T: PartialEq>(this: Option<&T>, that: Option<&T>) -> bool {


Agreed. This is the clippy lint that required the most changes, but was mechanical: rather than a reference to an option use an option with a reference.

pront · 2025-01-02T14:57:37Z

src/sinks/datadog/metrics/config.rs

@@ -233,13 +233,16 @@ impl DatadogMetricsConfig {
    }

    fn build_client(&self, proxy: &ProxyConfig) -> crate::Result<HttpClient> {
+        let default_tls_config;


I wonder if the following removes the need for this local variable:

let tls_settings = MaybeTlsSettings::from_config( Some( self.local_dd_common .tls .as_ref() .unwrap_or_else(|| TlsEnableableConfig::enabled()), ), false, )?;

I tried this first, actually, but the issue is that TlsEnableableConfig::enabled() returns an owned type rather than a reference which doesn't match the type of self.local_dd_common.tls.as_ref().

pront · 2025-01-02T14:57:54Z

src/sinks/datadog/traces/config.rs

@@ -188,13 +188,16 @@ impl DatadogTracesConfig {
    }

    pub fn build_client(&self, proxy: &ProxyConfig) -> crate::Result<HttpClient> {
+        let default_tls_config;


Same for this one

jszwedko

Thanks for the review! I responded inline.

jszwedko · 2025-01-02T15:54:14Z

lib/codecs/src/decoding/mod.rs

@@ -264,7 +264,6 @@ pub enum DeserializerConfig {
    ///
    /// Going forward, Vector will use that [Go SDK][implementation] as the reference implementation, which means
    /// the codec may continue to relax the enforcement of specification.
-


Hmm, I don't think so. We want this to be a doc comment so that is extracted and rendered in the docs.

jszwedko · 2025-01-02T15:55:06Z

lib/tracing-limit/benches/limit.rs

@@ -94,7 +94,7 @@ where

 struct Visitor<'a>(MutexGuard<'a, String>);

-impl<'a> field::Visit for Visitor<'a> {
+impl field::Visit for Visitor<'_> {


Agreed. I forgot to leave some comments about the clippy changes, but this was one of them about it being unnecessary to specify lifetimes in some places.

jszwedko · 2025-01-02T15:55:24Z

lib/vector-buffers/src/variants/disk_v2/common.rs

@@ -64,7 +64,7 @@ pub(crate) const fn align16(amount: usize) -> usize {
        "`amount` must be less than `MAX_ALIGNABLE_AMOUNT`"
    );

-    ((amount + SERIALIZER_ALIGNMENT - 1) / SERIALIZER_ALIGNMENT) * SERIALIZER_ALIGNMENT
+    amount.div_ceil(SERIALIZER_ALIGNMENT) * SERIALIZER_ALIGNMENT


Mmm, yeah, I didn't even notice this one since clippy --fix did it.

jszwedko · 2025-01-02T15:55:52Z

lib/vector-buffers/src/variants/disk_v2/tests/known_errors.rs

@@ -686,20 +700,6 @@ async fn reader_throws_error_when_record_is_undecodable_via_metadata() {
    static GET_METADATA_VALUE: AtomicU32 = AtomicU32::new(0);
    static CAN_DECODE_VALUE: AtomicU32 = AtomicU32::new(0);

-    impl AsMetadata for u32 {


Clippy complained that the impl would be pulled up so better to define it outside.

jszwedko · 2025-01-02T15:56:48Z

lib/vector-core/src/config/global_options.rs

@@ -239,7 +242,7 @@ impl GlobalOptions {
    }
 }

-fn conflicts<T: PartialEq>(this: &Option<T>, that: &Option<T>) -> bool {
+fn conflicts<T: PartialEq>(this: Option<&T>, that: Option<&T>) -> bool {


Agreed. This is the clippy lint that required the most changes, but was mechanical: rather than a reference to an option use an option with a reference.

jszwedko · 2025-01-02T15:58:10Z

src/sinks/datadog/metrics/config.rs

@@ -233,13 +233,16 @@ impl DatadogMetricsConfig {
    }

    fn build_client(&self, proxy: &ProxyConfig) -> crate::Result<HttpClient> {
+        let default_tls_config;


I tried this first, actually, but the issue is that TlsEnableableConfig::enabled() returns an owned type rather than a reference which doesn't match the type of self.local_dd_common.tls.as_ref().

…st-1.83 Signed-off-by: Jesse Szwedko <[email protected]>

Signed-off-by: Jesse Szwedko <[email protected]>

datadog-vectordotdev · 2025-01-02T17:11:40Z

Datadog Report

Branch report: jszwedko/upgrade-rust-1.83
Commit report: af6a2e7
Test service: vector

✅ 0 Failed, 560 Passed, 0 Skipped, 4m 4.12s Total Time

Signed-off-by: Jesse Szwedko <[email protected]>

…st-1.83

jszwedko added 12 commits December 13, 2024 10:30

chore(deps): Upgrade Rust to 1.82

3a2463a

Signed-off-by: Jesse Szwedko <[email protected]>

clippy

909b6e0

Signed-off-by: Jesse Szwedko <[email protected]>

Update tiltfile

a5ae269

Signed-off-by: Jesse Szwedko <[email protected]>

cargo fmt

3fc3a0b

Signed-off-by: Jesse Szwedko <[email protected]>

chore(deps): Bump Rust toolchain to 1.83

94a60a8

Signed-off-by: Jesse Szwedko <[email protected]>

clippy --fix

ac15da3

Signed-off-by: Jesse Szwedko <[email protected]>

more clippy

ea5a354

Signed-off-by: Jesse Szwedko <[email protected]>

Merge remote-tracking branch 'origin/master' into jszwedko/upgrade-ru…

2c0b91f

…st-1.83

clippy

f0c9b9d

Signed-off-by: Jesse Szwedko <[email protected]>

more clippy

d5c7670

Signed-off-by: Jesse Szwedko <[email protected]>

more clippy

7395ca4

Signed-off-by: Jesse Szwedko <[email protected]>

clippy

fa7976f

Signed-off-by: Jesse Szwedko <[email protected]>

jszwedko added the no-changelog Changes in this PR do not need user-facing explanations in the release changelog label Dec 20, 2024

jszwedko requested a review from a team as a code owner December 20, 2024 22:36

github-actions bot added domain: sources Anything related to the Vector's sources domain: sinks Anything related to the Vector's sinks domain: core Anything related to core crates i.e. vector-core, core-common, etc domain: vdev Anything related to the vdev tooling labels Dec 20, 2024

pront approved these changes Jan 2, 2025

View reviewed changes

jszwedko commented Jan 2, 2025

View reviewed changes

Merge remote-tracking branch 'origin/master' into jszwedko/upgrade-ru…

db6ee12

…st-1.83 Signed-off-by: Jesse Szwedko <[email protected]>

jszwedko enabled auto-merge January 2, 2025 16:52

cargo fmt

837b933

Signed-off-by: Jesse Szwedko <[email protected]>

jszwedko added 2 commits January 2, 2025 12:09

missed one

6d3a48f

Signed-off-by: Jesse Szwedko <[email protected]>

Merge remote-tracking branch 'origin/master' into jszwedko/upgrade-ru…

0cd2819

…st-1.83

jszwedko added this pull request to the merge queue Jan 2, 2025

Merged via the queue into master with commit ca084cc Jan 3, 2025
42 checks passed

jszwedko deleted the jszwedko/upgrade-rust-1.83 branch January 3, 2025 00:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(deps): Update Rust toolchain to 1.83.0 #22068

chore(deps): Update Rust toolchain to 1.83.0 #22068

jszwedko commented Dec 20, 2024

pront left a comment

pront Jan 2, 2025

jszwedko Jan 2, 2025

pront Jan 2, 2025

jszwedko Jan 2, 2025

pront Jan 2, 2025

jszwedko Jan 2, 2025

pront Jan 2, 2025

jszwedko Jan 2, 2025

pront Jan 2, 2025

jszwedko Jan 2, 2025

pront Jan 2, 2025

jszwedko left a comment

jszwedko Jan 2, 2025

jszwedko Jan 2, 2025

jszwedko Jan 2, 2025

jszwedko Jan 2, 2025

jszwedko Jan 2, 2025

jszwedko Jan 2, 2025

datadog-vectordotdev bot commented Jan 2, 2025 •

edited

Loading

chore(deps): Update Rust toolchain to 1.83.0 #22068

chore(deps): Update Rust toolchain to 1.83.0 #22068

Conversation

jszwedko commented Dec 20, 2024

Summary

Change Type

Is this a breaking change?

How did you test this PR?

Does this PR include user facing changes?

Checklist

References

pront left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jszwedko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

datadog-vectordotdev bot commented Jan 2, 2025 • edited Loading

Datadog Report

datadog-vectordotdev bot commented Jan 2, 2025 •

edited

Loading