Skip to content

Commit b11ca5d

Browse files
brucegbruceg
authored
chore(deps): Bump Rust version to 1.79 (#20670)
* chore(deps): Bump Rust version to 1.79 * Update Tiltfile * Delete unused fields in MongoDB metrics * Fix Windows build
1 parent 0e034ee commit b11ca5d

File tree

27 files changed

+56
-89
lines changed

27 files changed

+56
-89
lines changed

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
77
docker_build(
88
ref='timberio/vector',
99
context='.',
10-
build_args={'RUST_VERSION': '1.75.0'},
10+
build_args={'RUST_VERSION': '1.79.0'},
1111
dockerfile='tilt/Dockerfile'
1212
)
1313

‎lib/file-source/src/metadata_ext.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl PortableFileExt for File {
9595

9696
// This code is from the Rust stdlib https://github.com/rust-lang/rust/blob/a916ac22b9f7f1f0f7aba0a41a789b3ecd765018/src/libstd/sys/windows/c.rs#L380-L386
9797
#[cfg(windows)]
98-
#[allow(non_snake_case, non_camel_case_types)]
98+
#[allow(dead_code, non_snake_case, non_camel_case_types)]
9999
pub struct REPARSE_DATA_BUFFER {
100100
pub ReparseTag: libc::c_uint,
101101
pub ReparseDataLength: libc::c_ushort,

‎lib/vector-buffers/src/variants/disk_v2/record.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub enum RecordStatus {
2020
/// The record was able to be read from the buffer, and the checksum is valid.
2121
///
2222
/// Contains the ID for the given record, as well as the metadata.
23-
Valid { id: u64, metadata: u32 },
23+
Valid { id: u64 },
2424
/// The record was able to be read from the buffer, but the checksum was not valid.
2525
Corrupted { calculated: u32, actual: u32 },
2626
/// The record was not able to be read from the buffer due to an error during deserialization.
@@ -142,10 +142,7 @@ impl<'a> ArchivedRecord<'a> {
142142
pub fn verify_checksum(&self, checksummer: &Hasher) -> RecordStatus {
143143
let calculated = generate_checksum(checksummer, self.id, self.metadata, &self.payload);
144144
if self.checksum == calculated {
145-
RecordStatus::Valid {
146-
id: self.id,
147-
metadata: self.metadata,
148-
}
145+
RecordStatus::Valid { id: self.id }
149146
} else {
150147
RecordStatus::Corrupted {
151148
calculated,

‎lib/vector-buffers/src/variants/disk_v2/tests/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ macro_rules! assert_buffer_records {
8282
($ledger:expr, $record_count:expr) => {
8383
assert_eq!(
8484
$ledger.get_total_records(),
85-
$record_count as u64,
85+
u64::try_from($record_count).expect("Record count is out of range"),
8686
"ledger should have {} records, but had {}",
8787
$record_count,
8888
$ledger.get_total_records()
@@ -95,14 +95,14 @@ macro_rules! assert_buffer_size {
9595
($ledger:expr, $record_count:expr, $buffer_size:expr) => {
9696
assert_eq!(
9797
$ledger.get_total_records(),
98-
$record_count as u64,
98+
u64::try_from($record_count).expect("Record count is out of range"),
9999
"ledger should have {} records, but had {}",
100100
$record_count,
101101
$ledger.get_total_records()
102102
);
103103
assert_eq!(
104104
$ledger.get_total_buffer_size(),
105-
$buffer_size as u64,
105+
u64::try_from($buffer_size).expect("Buffer size is out of range"),
106106
"ledger should have {} bytes, but had {} bytes",
107107
$buffer_size,
108108
$ledger.get_total_buffer_size()
@@ -115,14 +115,14 @@ macro_rules! assert_reader_writer_v2_file_positions {
115115
($ledger:expr, $reader:expr, $writer:expr) => {{
116116
let (reader, writer) = $ledger.get_current_reader_writer_file_id();
117117
assert_eq!(
118-
($reader) as u16,
118+
u16::try_from($reader).expect("Reader value is out of range"),
119119
reader,
120120
"expected reader file ID of {}, got {} instead",
121121
($reader),
122122
reader
123123
);
124124
assert_eq!(
125-
($writer) as u16,
125+
u16::try_from($writer).expect("Writer value is out of range"),
126126
writer,
127127
"expected writer file ID of {}, got {} instead",
128128
($writer),

‎lib/vector-buffers/src/variants/disk_v2/tests/size_limits.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,15 @@ async fn writer_rolls_data_files_when_the_limit_is_exceeded() {
262262
writer.flush().await.expect("flush should not fail");
263263
writer.close();
264264

265-
assert_buffer_size!(ledger, 2, (first_bytes_written + second_bytes_written));
265+
assert_buffer_size!(ledger, 2, first_bytes_written + second_bytes_written);
266266
assert_reader_writer_v2_file_positions!(ledger, 0, 1);
267267

268268
// Now read both records, make sure they are what we expect, etc.
269269
let first_record_read = read_next_some(&mut reader).await;
270270
assert_eq!(first_record_read, first_record);
271271
acknowledge(first_record_read).await;
272272

273-
assert_buffer_size!(ledger, 2, (first_bytes_written + second_bytes_written));
273+
assert_buffer_size!(ledger, 2, first_bytes_written + second_bytes_written);
274274
assert_reader_writer_v2_file_positions!(ledger, 0, 1);
275275

276276
let second_record_read = read_next_some(&mut reader).await;
@@ -358,15 +358,15 @@ async fn writer_rolls_data_files_when_the_limit_is_exceeded_after_reload() {
358358
writer.flush().await.expect("flush should not fail");
359359
writer.close();
360360

361-
assert_buffer_size!(ledger, 2, (first_bytes_written + second_bytes_written));
361+
assert_buffer_size!(ledger, 2, first_bytes_written + second_bytes_written);
362362
assert_reader_writer_v2_file_positions!(ledger, 0, 1);
363363

364364
// Now read both records, make sure they are what we expect, etc.
365365
let first_record_read = read_next_some(&mut reader).await;
366366
assert_eq!(first_record_read, first_record);
367367
acknowledge(first_record_read).await;
368368

369-
assert_buffer_size!(ledger, 2, (first_bytes_written + second_bytes_written));
369+
assert_buffer_size!(ledger, 2, first_bytes_written + second_bytes_written);
370370
assert_reader_writer_v2_file_positions!(ledger, 0, 1);
371371

372372
let second_record_read = read_next_some(&mut reader).await;

‎lib/vector-config-common/src/validation.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Code generated by the `darling` derive macro triggers a clippy lint.
2+
// https://github.com/TedDriggs/darling/issues/293
3+
#![allow(clippy::manual_unwrap_or_default)]
4+
15
use darling::FromMeta;
26
use proc_macro2::TokenStream;
37
use quote::{quote, ToTokens};

‎lib/vector-config-macros/src/ast/container.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Code generated by the `darling` derive macro triggers a clippy lint.
2+
// https://github.com/TedDriggs/darling/issues/293
3+
#![allow(clippy::manual_unwrap_or_default)]
4+
15
use std::collections::HashSet;
26

37
use darling::{error::Accumulator, util::Flag, FromAttributes};

‎lib/vector-stream/src/partitioned_batcher.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,15 +454,15 @@ mod test {
454454
}
455455

456456
fn arb_partitioner() -> impl Strategy<Value = TestPartitioner> {
457-
(1..u8::max_value(),).prop_map(|(ks,)| TestPartitioner {
457+
(1..u8::MAX,).prop_map(|(ks,)| TestPartitioner {
458458
key_space: NonZeroU8::new(ks).unwrap(),
459459
})
460460
}
461461

462462
proptest! {
463463
#[test]
464464
fn size_hint_eq(stream: Vec<u64>,
465-
item_limit in 1..u16::max_value(),
465+
item_limit in 1..u16::MAX,
466466
allocation_limit in 8..128,
467467
partitioner in arb_partitioner(),
468468
timer in arb_timer()) {
@@ -488,7 +488,7 @@ mod test {
488488
proptest! {
489489
#[test]
490490
fn batch_item_size_leq_limit(stream: Vec<u64>,
491-
item_limit in 1..u16::max_value(),
491+
item_limit in 1..u16::MAX,
492492
allocation_limit in 8..128,
493493
partitioner in arb_partitioner(),
494494
timer in arb_timer()) {
@@ -556,7 +556,7 @@ mod test {
556556
proptest! {
557557
#[test]
558558
fn batch_does_not_reorder(stream: Vec<u64>,
559-
item_limit in 1..u16::max_value(),
559+
item_limit in 1..u16::MAX,
560560
allocation_limit in 8..128,
561561
partitioner in arb_partitioner(),
562562
timer in arb_timer()) {
@@ -602,7 +602,7 @@ mod test {
602602
proptest! {
603603
#[test]
604604
fn batch_does_not_lose_items(stream: Vec<u64>,
605-
item_limit in 1..u16::max_value(),
605+
item_limit in 1..u16::MAX,
606606
allocation_limit in 8..128,
607607
partitioner in arb_partitioner(),
608608
timer in arb_timer()) {

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.78"
2+
channel = "1.79"
33
profile = "default"

‎src/api/schema/components/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use crate::{
2323
filter_check,
2424
};
2525

26+
#[allow(clippy::duplicated_attributes)] // False positive caused by `ty = "String"`
2627
#[derive(Debug, Clone, Interface)]
2728
#[graphql(
2829
field(name = "component_id", ty = "String"),

0 commit comments

Comments
 (0)