Skip to content

Commit fffcea5

Browse files
chore(dev): upgrade to Rust 2024 edition (#23522)
* chore(dev): upgrade to Rust 2024 edition * cargo clippy --fix * bump to 2024 * fixes and updates * cargo fmt --all * fmt * more fixes * more fixes * Update src/sinks/socket.rs Co-authored-by: Thomas <[email protected]> * ran cargo fmt * change edition in rustfmt * ran cargo fmt * ran cargo fmt * address reporter future return type clippy failure * ran cargo fmt * events check * ran cargo fmt * running.rs changes * upgrade cargo-deb * ran cargo fmt * fix * ran cargo fmt * cargo-deb override * older cargo-deb * downgrade cargo-deb * fix one windows failure * fix windows error[E0521] --------- Co-authored-by: Thomas <[email protected]>
1 parent 3f7f6eb commit fffcea5

File tree

583 files changed

+3229
-2820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

583 files changed

+3229
-2820
lines changed

.rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
edition = "2021"
1+
edition = "2024"
22
newline_style = "unix"
33
reorder_imports = true
44

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "vector"
33
version = "0.50.0"
44
authors = ["Vector Contributors <[email protected]>"]
5-
edition = "2021"
5+
edition = "2024"
66
description = "A lightweight and ultra-fast tool for building observability pipelines"
77
homepage = "https://vector.dev"
88
license = "MPL-2.0"

aqua/aqua.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ registries:
66
ref: v4.268.0 # renovate: depName=aquaproj/aqua-registry
77
packages:
88
- name: rustwasm/[email protected]
9-
- name: crates.io/cargo-deb@3.4.1
9+
- name: crates.io/cargo-deb@2.9.3
1010
- name: cross-rs/[email protected]
1111
- name: nextest-rs/nextest/[email protected]
1212
- name: EmbarkStudios/[email protected]

benches/batch.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::{convert::Infallible, time::Duration};
22

33
use bytes::{BufMut, Bytes, BytesMut};
4-
use criterion::{criterion_group, Criterion, SamplingMode, Throughput};
5-
use futures::{future, stream, SinkExt, StreamExt};
4+
use criterion::{Criterion, SamplingMode, Throughput, criterion_group};
5+
use futures::{SinkExt, StreamExt, future, stream};
66
use vector::{
77
sinks::util::{
8-
batch::{Batch, BatchConfig, BatchError, BatchSettings, BatchSize, PushResult},
98
BatchSink, Buffer, Compression, EncodedEvent, Merged, Partition, PartitionBatchSink,
109
SinkBatchSettings,
10+
batch::{Batch, BatchConfig, BatchError, BatchSettings, BatchSize, PushResult},
1111
},
1212
test_util::{random_lines, runtime},
1313
};

benches/codecs/character_delimited_bytes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ use std::{fmt, time::Duration};
22

33
use bytes::BytesMut;
44
use criterion::{
5-
criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
6-
SamplingMode, Throughput,
5+
BatchSize, BenchmarkGroup, BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group,
6+
measurement::WallTime,
77
};
88
use tokio_util::codec::Decoder;
99
use vector_lib::codecs::{
10-
decoding::{Deserializer, Framer},
1110
BytesDeserializer, CharacterDelimitedDecoder,
11+
decoding::{Deserializer, Framer},
1212
};
1313

1414
#[derive(Debug)]

benches/codecs/encoder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use std::time::Duration;
22

33
use bytes::{BufMut, BytesMut};
44
use criterion::{
5-
criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion, SamplingMode,
6-
Throughput,
5+
BatchSize, BenchmarkGroup, Criterion, SamplingMode, Throughput, criterion_group,
6+
measurement::WallTime,
77
};
88
use tokio_util::codec::Encoder;
99
use vector::event::{Event, LogEvent};
10-
use vector_lib::codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoder};
10+
use vector_lib::codecs::{JsonSerializerConfig, NewlineDelimitedEncoder, encoding::Framer};
1111
use vector_lib::{btreemap, byte_size_of::ByteSizeOf};
1212

1313
#[derive(Debug, Clone)]

benches/codecs/newline_bytes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use std::{fmt, time::Duration};
22

33
use bytes::BytesMut;
44
use criterion::{
5-
criterion_group, measurement::WallTime, BatchSize, BenchmarkGroup, BenchmarkId, Criterion,
6-
SamplingMode, Throughput,
5+
BatchSize, BenchmarkGroup, BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group,
6+
measurement::WallTime,
77
};
88
use tokio_util::codec::Decoder;
99
use vector_lib::codecs::{
10-
decoding::Deserializer, decoding::Framer, BytesDeserializer, NewlineDelimitedDecoder,
10+
BytesDeserializer, NewlineDelimitedDecoder, decoding::Deserializer, decoding::Framer,
1111
};
1212

1313
#[derive(Debug)]

benches/distribution_statistic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
1+
use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
22
use rand::distr::Distribution;
33
use rand::{distr::Uniform, seq::SliceRandom};
44
use vector::{event::metric::Sample, sinks::util::statistic::DistributionStatistic};

benches/dnstap/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use base64::engine::general_purpose::STANDARD;
21
use base64::Engine;
2+
use base64::engine::general_purpose::STANDARD;
33
use bytes::Bytes;
4-
use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
4+
use criterion::{BatchSize, Criterion, Throughput, criterion_group, criterion_main};
55
use dnsmsg_parser::dns_message_parser::DnsParserOptions;
66
use dnstap_parser::parser::DnstapParser;
77
use vector::event::LogEvent;

benches/enrichment_tables.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::time::SystemTime;
22

33
use chrono::prelude::*;
4-
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
4+
use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
55
use vector::enrichment_tables::file::FileData;
66
use vector::enrichment_tables::{
7+
Condition, Table,
78
file::File,
89
geoip::{Geoip, GeoipConfig},
910
mmdb::{Mmdb, MmdbConfig},
10-
Condition, Table,
1111
};
1212
use vector_lib::enrichment::Case;
1313
use vrl::value::{ObjectMap, Value};
@@ -241,7 +241,7 @@ fn benchmark_enrichment_tables_geoip(c: &mut Criterion) {
241241
let mut group = c.benchmark_group("enrichment_tables_geoip");
242242
let build = |path: &str| {
243243
Geoip::new(GeoipConfig {
244-
path: path.to_string(),
244+
path: path.into(),
245245
locale: "en".to_string(),
246246
})
247247
.unwrap()
@@ -320,12 +320,7 @@ fn benchmark_enrichment_tables_geoip(c: &mut Criterion) {
320320

321321
fn benchmark_enrichment_tables_mmdb(c: &mut Criterion) {
322322
let mut group = c.benchmark_group("enrichment_tables_mmdb");
323-
let build = |path: &str| {
324-
Mmdb::new(MmdbConfig {
325-
path: path.to_string(),
326-
})
327-
.unwrap()
328-
};
323+
let build = |path: &str| Mmdb::new(MmdbConfig { path: path.into() }).unwrap();
329324

330325
group.bench_function("enrichment_tables/mmdb_isp", |b| {
331326
let table = build("tests/data/GeoIP2-ISP-Test.mmdb");

0 commit comments

Comments
 (0)