Skip to content

Commit

Permalink
Merge pull request #1134 from Luap99/lint-1.83
Browse files Browse the repository at this point in the history
fix new rust 1.83 lint errors
  • Loading branch information
openshift-merge-bot[bot] authored Dec 3, 2024
2 parents 07c4e43 + 6453c23 commit f397d88
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/firewall/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ use crate::{
wrap,
};

/// File layout looks like this
/// $config/firewall/
/// - firewall-driver -> name of the firewall driver
/// - networks/$netID -> network config setup
/// - ports/$netID_$conID -> port config
// File layout looks like this
// $config/firewall/
// - firewall-driver -> name of the firewall driver
// - networks/$netID -> network config setup
// - ports/$netID_$conID -> port config

const FIREWALL_DIR: &str = "firewall";
const FIREWALL_DRIVER_FILE: &str = "firewall-driver";
Expand Down
2 changes: 1 addition & 1 deletion src/firewall/varktables/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub struct VarkChain<'a> {
pub td_policy: Option<TeardownPolicy>,
}

impl<'a> VarkChain<'a> {
impl VarkChain<'_> {
fn new(
driver: &IPTables,
table: String,
Expand Down
2 changes: 1 addition & 1 deletion src/network/bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ impl<'a> Bridge<'a> {
nameservers: &'a Vec<IpAddr>,
isolate: IsolateOption,
bridge_name: String,
) -> NetavarkResult<(SetupNetwork, PortForwardConfig)> {
) -> NetavarkResult<(SetupNetwork, PortForwardConfig<'a>)> {
let id_network_hash =
CoreUtils::create_network_hash(&self.info.network.name, MAX_HASH_SIZE);
let sn = SetupNetwork {
Expand Down

0 comments on commit f397d88

Please sign in to comment.