From 639df24ac335f3700f30b0da58e2a3edd03084a5 Mon Sep 17 00:00:00 2001 From: Greg Holland <30577851+horned-sphere@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:02:49 +0000 Subject: [PATCH] Upgraded to Rust 1.82.0. --- .github/workflows/ci.yml | 2 +- example_apps/console/src/model/mod.rs | 2 +- example_apps/console/src/model/parse/mod.rs | 4 +- example_apps/console/src/model/parse/tests.rs | 2 +- example_apps/console/src/ui/mod.rs | 2 +- .../src/ingress/mod.rs | 47 ++++++++++--------- 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72b366302..d1d14d7f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: name: Continuous integration env: - latest_version: "1.81.0" + latest_version: "1.82.0" jobs: test: diff --git a/example_apps/console/src/model/mod.rs b/example_apps/console/src/model/mod.rs index e139be856..2a7b1c5dc 100644 --- a/example_apps/console/src/model/mod.rs +++ b/example_apps/console/src/model/mod.rs @@ -160,7 +160,7 @@ pub enum AppCommand { Quit, Clear, Help { command_name: Option }, - Controller(ControllerCommand), + Controller(Box), } #[derive(Debug)] diff --git a/example_apps/console/src/model/parse/mod.rs b/example_apps/console/src/model/parse/mod.rs index 1297ae0f3..176092be8 100644 --- a/example_apps/console/src/model/parse/mod.rs +++ b/example_apps/console/src/model/parse/mod.rs @@ -103,9 +103,9 @@ pub fn parse_app_command(command: &str) -> Result> }), ["quit"] => Ok(AppCommand::Quit), ["clear"] => Ok(AppCommand::Clear), - _ => Ok(AppCommand::Controller(parse_controller_command( + _ => Ok(AppCommand::Controller(Box::new(parse_controller_command( command_parts.as_slice(), - )?)), + )?))), } } diff --git a/example_apps/console/src/model/parse/tests.rs b/example_apps/console/src/model/parse/tests.rs index 9bce3b3a0..5bee85b6e 100644 --- a/example_apps/console/src/model/parse/tests.rs +++ b/example_apps/console/src/model/parse/tests.rs @@ -105,7 +105,7 @@ fn mixed_tokens3() { fn to_controller(cmd: AppCommand) -> ControllerCommand { if let AppCommand::Controller(c) = cmd { - c + *c } else { panic!("Unexpected command kind."); } diff --git a/example_apps/console/src/ui/mod.rs b/example_apps/console/src/ui/mod.rs index 96eda892f..b9a7aebe4 100644 --- a/example_apps/console/src/ui/mod.rs +++ b/example_apps/console/src/ui/mod.rs @@ -434,7 +434,7 @@ fn on_command( Ok(AppCommand::Clear) => None, Ok(AppCommand::Controller(command)) => Some( controller - .perform_action(command) + .perform_action(*command) .into_iter() .map(|msg| format!("{}\n", msg)) .map(Cow::Owned) diff --git a/server/swimos_connector_fluvio/src/ingress/mod.rs b/server/swimos_connector_fluvio/src/ingress/mod.rs index 0b0b6ef79..a83fb75eb 100644 --- a/server/swimos_connector_fluvio/src/ingress/mod.rs +++ b/server/swimos_connector_fluvio/src/ingress/mod.rs @@ -112,7 +112,7 @@ where let relays = relays.clone(); Ok(unfold( - ConnectorState::Uninit(configuration.clone(), factory.clone()), + ConnectorState::Uninit(Box::new(configuration.clone()), factory.clone()), move |state: ConnectorState| { let topic = topic.clone(); let key_deser = key_deser.clone(); @@ -122,28 +122,29 @@ where let fut = async move { match state { - ConnectorState::Uninit(config, factory) => match factory.open(config).await - { - Ok(consumer) => { - let (key, value) = - match load_deserializers(key_deser, value_deser).await { - Ok((key, value)) => (key, value), - Err(e) => { - return Some(( - Err(FluvioConnectorError::Configuration(e)), - ConnectorState::Failed, - )) - } - }; - poll_dispatch( - consumer, - topic, - MessageSelector::new(key, value, lanes, relays), - ) - .await + ConnectorState::Uninit(config, factory) => { + match factory.open(*config).await { + Ok(consumer) => { + let (key, value) = + match load_deserializers(key_deser, value_deser).await { + Ok((key, value)) => (key, value), + Err(e) => { + return Some(( + Err(FluvioConnectorError::Configuration(e)), + ConnectorState::Failed, + )) + } + }; + poll_dispatch( + consumer, + topic, + MessageSelector::new(key, value, lanes, relays), + ) + .await + } + Err(e) => Some((Err(e), ConnectorState::Failed)), } - Err(e) => Some((Err(e), ConnectorState::Failed)), - }, + } ConnectorState::Running { topic, consumer, @@ -185,7 +186,7 @@ where } enum ConnectorState { - Uninit(FluvioIngressConfiguration, F), + Uninit(Box, F), Running { topic: String, consumer: C,