Skip to content

Remove use of async_trait #304

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.

Sign up for GitHub

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

Merged
DanNixon merged 1 commit into from
Feb 3, 2025
Merged

Remove use of async_trait #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ edition = "2021"
[workspace.dependencies]
anyhow = "1.0"
assert_approx_eq = "1.1.0"
async-trait = "0.1.83"
chrono = { version = "0.4.39", features = ["serde"] }
clap = { version = "4.5", features = ["derive", "env"] }
crossterm = "0.26.1"
Expand Down
1 change: 0 additions & 1 deletion trace-archiver-tdengine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ edition.workspace = true

[dependencies]
anyhow.workspace = true
async-trait.workspace = true
chrono.workspace = true
clap.workspace = true
itertools.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions trace-archiver-tdengine/src/tdengine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ pub mod framedata;
mod views;
pub mod wrapper;

use async_trait::async_trait;
use error::{StatementErrorCode, TDEngineError, TraceMessageErrorCode};
use supermusr_streaming_types::dat2_digitizer_analog_trace_v2_generated::DigitizerAnalogTraceMessage;

#[async_trait]
pub(crate) trait TimeSeriesEngine {
async fn process_message(&mut self, msg: &DigitizerAnalogTraceMessage) -> anyhow::Result<()>;
async fn post_message(&mut self) -> anyhow::Result<usize>;
Expand Down
4 changes: 1 addition & 3 deletions trace-archiver-tdengine/src/tdengine/wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use super::{
views::{create_column_views, create_frame_column_views},
StatementErrorCode, TDEngineError, TimeSeriesEngine, TraceMessageErrorCode,
};
use async_trait::async_trait;
use supermusr_streaming_types::dat2_digitizer_analog_trace_v2_generated::DigitizerAnalogTraceMessage;
use taos::{AsyncBindable, AsyncQueryable, AsyncTBuilder, Stmt, Taos, TaosBuilder, Value};
use tracing::debug;
Expand Down Expand Up @@ -130,7 +129,6 @@ impl TDEngine {
}
}

#[async_trait]
impl TimeSeriesEngine for TDEngine {
/// Takes a reference to a ``DigitizerAnalogTraceMessage`` instance and extracts the relevant data from it.
/// The user should then call ``post_message`` to send the data to the tdengine server.
Expand All @@ -141,7 +139,7 @@ impl TimeSeriesEngine for TDEngine {
/// An emtpy result or an error arrising a malformed ``DigitizerAnalogTraceMessage`` parameter.
async fn process_message(
&mut self,
message: &DigitizerAnalogTraceMessage,
message: &DigitizerAnalogTraceMessage<'_>,
) -> anyhow::Result<()> {
// Obtain the channel data, and error check
self.error.test_metadata(message);
Expand Down
Loading