diff --git a/src/agent/src/watcher.rs b/src/agent/src/watcher.rs index d03b4f97d..a04e8bae9 100644 --- a/src/agent/src/watcher.rs +++ b/src/agent/src/watcher.rs @@ -3,20 +3,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#![allow(clippy::unknown_clippy_lints)] + use std::collections::HashMap; use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::SystemTime; -use tokio::fs; -use tokio::sync::Mutex; -use tokio::task; -use tokio::time::{self, Duration}; -use thiserror::Error; use anyhow::{ensure, Context, Result}; use async_recursion::async_recursion; use nix::mount::{umount, MsFlags}; use slog::{debug, error, info, warn, Logger}; +use thiserror::Error; +use tokio::fs; +use tokio::sync::Mutex; +use tokio::task; +use tokio::time::{self, Duration}; use crate::mount::BareMount; use crate::protocols::agent as protos; diff --git a/src/agent/vsock-exporter/Cargo.toml b/src/agent/vsock-exporter/Cargo.toml index e822ac695..ba24dedc6 100644 --- a/src/agent/vsock-exporter/Cargo.toml +++ b/src/agent/vsock-exporter/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] nix = "0.21.0" libc = "0.2.94" -thiserror = "1.0.24" +thiserror = "1.0.26" opentelemetry = { version = "0.14.0", features=["serialize"] } serde = { version = "1.0.126", features = ["derive"] } tokio-vsock = "0.3.1" diff --git a/src/agent/vsock-exporter/src/lib.rs b/src/agent/vsock-exporter/src/lib.rs index e0e91c0cd..f83ee5072 100644 --- a/src/agent/vsock-exporter/src/lib.rs +++ b/src/agent/vsock-exporter/src/lib.rs @@ -12,6 +12,8 @@ // payload, which allows the forwarder to know how many bytes it must read to // consume the trace span. The payload is a serialised version of the trace span. +#![allow(clippy::unknown_clippy_lints)] + use async_trait::async_trait; use byteorder::{ByteOrder, NetworkEndian}; use opentelemetry::sdk::export::trace::{ExportResult, SpanData, SpanExporter}; @@ -19,6 +21,7 @@ use opentelemetry::sdk::export::ExportError; use slog::{error, info, o, Logger}; use std::io::ErrorKind; use std::sync::Arc; +use thiserror::Error; use tokio::io::AsyncWriteExt; use tokio::sync::Mutex; use tokio_vsock::VsockStream; @@ -50,7 +53,7 @@ impl Exporter { } } -#[derive(thiserror::Error, Debug)] +#[derive(Error, Debug)] pub enum Error { #[error("connection error: {0}")] ConnectionError(String),