maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(contrib): upgrade to 2024 edition

Browse source 
Part of #114
This edition change doesn't affect these crates except for formatting.

Change-Id: I441c967b6803f1f839379c2ec13dee3f0958fb05
Reviewed-on: https://cl.snix.dev/c/snix/+/30593
Autosubmit: Bence Nemes <nemes.bence1@gmail.com>
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Reviewed-by: Florian Klink <flokli@flokli.de>
Tested-by: besadii
This commit is contained in:
Starnick4444 2025-07-01 08:28:28 +02:00 • committed by clbot
parent d829261a09
commit f242bc6df8
27 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/crunch-v2/Cargo.nix
View file

@ -1581,7 +1581,7 @@ rec {
"crunch-v2" = rec {
crateName = "crunch-v2";
version = "0.1.0";
edition = "2021";
edition = "2024";
crateBin = [
{
name = "crunch-v2";

2
contrib/crunch-v2/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "crunch-v2"
version = "0.1.0"
edition = "2021"
edition = "2024"
[workspace]
members = ["."]

1
contrib/crunch-v2/rustfmt.toml Normal file
View file

@ -0,0 +1 @@
edition = "2024"

4
contrib/crunch-v2/src/bin/extract.rs
View file

@ -16,8 +16,8 @@ use prost::Message;
use polars::{
chunked_array::builder::AnonymousOwnedListBuilder,
prelude::{
df, BinaryChunkedBuilder, ChunkedBuilder, DataFrame, DataType, Field, ListBuilderTrait,
NamedFrom, ParquetWriter, PrimitiveChunkedBuilder, Series, UInt32Type,
BinaryChunkedBuilder, ChunkedBuilder, DataFrame, DataType, Field, ListBuilderTrait,
NamedFrom, ParquetWriter, PrimitiveChunkedBuilder, Series, UInt32Type, df,
},
series::IntoSeries,
};

4
contrib/crunch-v2/src/main.rs
View file

@ -15,7 +15,7 @@ mod remote;
use anyhow::Result;
use clap::Parser;
use futures::{stream, StreamExt, TryStreamExt};
use futures::{StreamExt, TryStreamExt, stream};
use indicatif::{ProgressBar, ProgressStyle};
use std::{
io::{self, BufRead, Read, Write},
@ -24,7 +24,7 @@ use std::{
};
use polars::{
prelude::{col, LazyFrame, ScanArgsParquet},
prelude::{LazyFrame, ScanArgsParquet, col},
sql::sql_expr,
};

8
contrib/crunch-v2/src/remote.rs
View file

@ -5,16 +5,16 @@ use std::{
task::{self, Poll},
};
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use bytes::{Buf, Bytes};
use futures::{future::BoxFuture, Future, FutureExt, Stream, StreamExt};
use futures::{Future, FutureExt, Stream, StreamExt, future::BoxFuture};
use lazy_static::lazy_static;
use tokio::runtime::Handle;
use nix_compat::nixbase32;
use rusoto_core::{ByteStream, Region};
use rusoto_s3::{GetObjectOutput, GetObjectRequest, S3Client, S3};
use rusoto_s3::{GetObjectOutput, GetObjectRequest, S3, S3Client};
use bzip2::read::BzDecoder;
use xz2::read::XzDecoder;
@ -106,7 +106,7 @@ impl FileKey {
&self,
offset: u64,
e_tag: Option<&str>,
) -> impl Future<Output = io::Result<GetObjectOutput>> + Send + 'static {
) -> impl Future<Output = io::Result<GetObjectOutput>> + Send + 'static + use<> {
let input = GetObjectRequest {
bucket: BUCKET.to_string(),
key: format!(