Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use Rust 1.83.0 #4277

Merged
merged 5 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/fluvio-cluster/src/runtime/local/spu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ impl SpuTarget for LocalSpuProcess {

const BASE_PORT: u16 = 9010;
const BASE_SPU: u16 = 5001;
/// manage spu process cluster

/// Manage SPU Process Cluster
pub struct LocalSpuProcessClusterManager {
pub log_dir: PathBuf,
pub launcher: Option<PathBuf>,
Expand Down
1 change: 0 additions & 1 deletion crates/fluvio-cluster/src/start/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ impl LocalInstaller {
/// # Ok(())
/// # }
/// ```

pub fn from_config(config: LocalConfig) -> Self {
Self {
pb_factory: ProgressBarFactory::new(config.hide_spinner),
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-controlplane-metadata/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fluvio-controlplane-metadata"
edition = "2021"
version = "0.30.0"
version = "0.30.1"
authors = ["Fluvio Contributors <team@fluvio.io>"]
description = "Metadata definition for Fluvio control plane"
repository = "https://github.com/infinyon/fluvio"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ impl std::convert::TryFrom<&str> for SmartModuleVisibility {

/// Convert from name into something that can be used as key in the store
/// For now, we respect

#[cfg(test)]
mod package_test {
use crate::smartmodule::SmartModulePackageKey;
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-controlplane/src/sc_api/api.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! API call from Spu to SC

use std::io::Error as IoError;
use std::convert::TryInto;

Expand All @@ -15,8 +17,6 @@ use super::register_spu::RegisterSpuRequest;
use super::update_lrs::UpdateLrsRequest;
use super::remove::ReplicaRemovedRequest;

/// API call from Spu to SC

#[repr(u16)]
#[derive(Eq, PartialEq, Debug, Encoder, Decoder, Clone, Copy)]
#[fluvio(encode_discriminant)]
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-smartengine/src/engine/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// SmartModule configuration
//! SmartModule configuration

mod config;
mod error;
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/src/control_plane/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// Responsible for communication with SC
//! Responsible for communication with SC

mod dispatcher;
mod action;
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/src/smartengine/produce_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct ProduceBatchIterator<'a> {
len: usize,
}

impl<'a> SmartModuleInputBatch for ProduceBatch<'a> {
impl SmartModuleInputBatch for ProduceBatch<'_> {
fn records(&self) -> &Vec<u8> {
&self.records
}
Expand Down
2 changes: 0 additions & 2 deletions crates/fluvio-storage/src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ impl OffsetPosition for Entry {
///
/// For active segment, index can grow
/// For non active, it is fixed

// implement index file
pub struct LogIndex {
#[allow(dead_code)]
mmap: MemoryMappedFile,
Expand Down
2 changes: 0 additions & 2 deletions crates/fluvio-storage/src/mut_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ pub const EXTENSION: &str = "index";

/// Index file for offset
/// Each entry in index consist of pair of (relative_offset, file_position)

// implement index file
pub struct MutLogIndex {
mmap: MemoryMappedMutFile,
file: File,
Expand Down
5 changes: 2 additions & 3 deletions crates/fluvio-storage/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,11 @@ impl LogValidator {
}
}

/// validate the file and find last offset
/// if file is not valid then return error

#[cfg(test)]
#[cfg(feature = "fixture")]
mod tests {
//! validate the file and find last offset
//! if file is not valid then return error

use std::env::temp_dir;

Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-stream-dispatcher/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fluvio-stream-dispatcher"
edition = "2021"
version = "0.13.6"
version = "0.13.7"
authors = ["Fluvio Contributors <team@fluvio.io>"]
description = "Fluvio Event Stream access"
repository = "https://github.com/infinyon/fluvio"
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-stream-dispatcher/src/metadata/k8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ mod tests {
assert_eq!(updates.len(), 3);

assert!(
matches!(updates.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq(""))
matches!(updates.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().is_empty())
);
assert!(
matches!(updates.get(1), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq("new status"))
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-stream-dispatcher/src/metadata/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ spec:
assert_eq!(updates.len(), 3);

assert!(
matches!(updates.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq(""))
matches!(updates.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().is_empty())
);
assert!(
matches!(updates.get(1), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq("new status"))
Expand Down Expand Up @@ -1214,7 +1214,7 @@ spec:
assert_eq!(updates1.len(), 3);

assert!(
matches!(updates1.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq(""))
matches!(updates1.first(), Some(LSUpdate::Mod(obj)) if obj.status.to_string().is_empty())
);
assert!(
matches!(updates1.get(1), Some(LSUpdate::Mod(obj)) if obj.status.to_string().eq("new status"))
Expand Down
1 change: 0 additions & 1 deletion crates/fluvio/src/fluvio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ impl Fluvio {
/// Ok(())
/// }
/// ```

pub async fn consumer_with_config(
&self,
config: ConsumerConfigExt,
Expand Down
3 changes: 1 addition & 2 deletions crates/fluvio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
feature = "nightly",
doc = include_str!("../../../DEVELOPER.md")
)]

#[doc = include_str!("../README.md")]
#![doc = include_str!("../README.md")]

mod admin;
mod error;
Expand Down
2 changes: 1 addition & 1 deletion release-tools/check-crate-version/toml-diff/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use toml::{map::Map, Value as TomlValue};

use crate::{TomlChange, TomlDiff};

impl<'a> fmt::Display for TomlDiff<'a> {
impl fmt::Display for TomlDiff<'_> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for change in &self.changes {
match change {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.82.0"
channel = "1.83.0"