diff --git a/experimental/Cargo.toml b/experimental/Cargo.toml index f40c3dac3..5c5378655 100644 --- a/experimental/Cargo.toml +++ b/experimental/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "centreon-generic-snmp" version = "1.0.0" +edition = "2024" [build-dependencies] lalrpop = "0.22.1" diff --git a/experimental/src/compute/ast.rs b/experimental/src/compute/ast.rs index 052423012..de8bc8acb 100644 --- a/experimental/src/compute/ast.rs +++ b/experimental/src/compute/ast.rs @@ -1,5 +1,5 @@ -use log::{debug, info, trace, warn}; -use snmp::SnmpResult; +use crate::snmp::SnmpResult; +use log::{info, warn}; use std::str; #[derive(Debug)] diff --git a/experimental/src/compute/mod.rs b/experimental/src/compute/mod.rs index edb8e5793..797f2c2fa 100644 --- a/experimental/src/compute/mod.rs +++ b/experimental/src/compute/mod.rs @@ -4,11 +4,11 @@ pub mod threshold; use self::ast::ExprResult; use self::lexer::{LexicalError, Tok}; -use lalrpop_util::{lalrpop_mod, ParseError}; +use crate::snmp::SnmpResult; +use lalrpop_util::{ParseError, lalrpop_mod}; use log::debug; use regex::Regex; use serde::Deserialize; -use snmp::SnmpResult; lalrpop_mod!(grammar); diff --git a/experimental/src/compute/threshold.rs b/experimental/src/compute/threshold.rs index 2eec48d16..e07100d3d 100644 --- a/experimental/src/compute/threshold.rs +++ b/experimental/src/compute/threshold.rs @@ -1,4 +1,4 @@ -use generic::error::Error; +use crate::generic::error::Error; use log::{debug, error, info, trace, warn}; use std::f64::INFINITY; diff --git a/experimental/src/generic/error.rs b/experimental/src/generic/error.rs index a5a48c881..e3fdf22ad 100644 --- a/experimental/src/generic/error.rs +++ b/experimental/src/generic/error.rs @@ -1,5 +1,4 @@ -use serde_json::Error as JsonError; -use snafu::prelude::*; +use snafu::prelude::Snafu; use std::path::PathBuf; #[derive(Debug, Snafu)] diff --git a/experimental/src/generic/mod.rs b/experimental/src/generic/mod.rs index ea89b3968..27a774fed 100644 --- a/experimental/src/generic/mod.rs +++ b/experimental/src/generic/mod.rs @@ -4,11 +4,11 @@ extern crate serde_json; pub mod error; use self::error::Result; -use compute::{ast::ExprResult, threshold::Threshold, Compute, Parser}; +use crate::compute::{Compute, Parser, ast::ExprResult, threshold::Threshold}; +use crate::output::{Output, OutputFormatter}; +use crate::snmp::{snmp_bulk_get, snmp_bulk_walk, snmp_bulk_walk_with_labels}; use log::{debug, trace}; -use output::{Output, OutputFormatter}; use serde::Deserialize; -use snmp::{snmp_bulk_get, snmp_bulk_walk, snmp_bulk_walk_with_labels}; use std::collections::HashMap; use crate::snmp::SnmpResult; diff --git a/experimental/src/grammar.lalrpop b/experimental/src/grammar.lalrpop index fe3f4a881..155bfa3d7 100644 --- a/experimental/src/grammar.lalrpop +++ b/experimental/src/grammar.lalrpop @@ -1,5 +1,5 @@ -use compute::lexer; -use compute::ast; +use crate::compute::lexer; +use crate::compute::ast; grammar<'input>; diff --git a/experimental/src/output/mod.rs b/experimental/src/output/mod.rs index b2aac3110..f7ed3f805 100644 --- a/experimental/src/output/mod.rs +++ b/experimental/src/output/mod.rs @@ -1,7 +1,7 @@ +use crate::compute::Parser; +use crate::compute::ast::ExprResult; +use crate::generic::{Perfdata, Status}; use crate::snmp::SnmpResult; -use compute::ast::ExprResult; -use compute::Parser; -use generic::{Perfdata, Status}; use log::error; use serde::Deserialize; diff --git a/experimental/src/snmp/mod.rs b/experimental/src/snmp/mod.rs index a53d03b5b..678253cc9 100644 --- a/experimental/src/snmp/mod.rs +++ b/experimental/src/snmp/mod.rs @@ -3,7 +3,7 @@ extern crate rasn; extern crate rasn_smi; extern crate rasn_snmp; -use compute::ast::ExprResult; +use crate::compute::ast::ExprResult; use log::{info, trace, warn}; use rasn::types::ObjectIdentifier; use rasn_snmp::v2::BulkPdu;