Skip to content

Commit

Permalink
DROP THIS COMMIT BEFORE MERGE
Browse files Browse the repository at this point in the history
Scratch commit to make CI run prior to review
  • Loading branch information
daniel-noland committed May 8, 2024
1 parent 4dfa69e commit 4e99be4
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 31 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Build

on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- main
on: [push]

jobs:
build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/clippy-rustfmt.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Rustfmt and clippy check

on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- main
on: [push]

jobs:
rustfmt_clippy:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: license

on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- main
on: [push]

jobs:
check-license:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: CI

on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- main
on: [push]

jobs:
ci:
Expand Down
2 changes: 2 additions & 0 deletions src/tc/actions/header.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use netlink_packet_utils::nla::{NlaBuffer, NlasIterator};
use netlink_packet_utils::{DecodeError, Emitable, Parseable};

Expand Down
2 changes: 2 additions & 0 deletions src/tc/actions/message.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use anyhow::Context;
use netlink_packet_utils::nla::{DefaultNla, NlaBuffer};
use netlink_packet_utils::nla::{Nla, NlasIterator};
Expand Down
1 change: 0 additions & 1 deletion src/tc/actions/nat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ pub enum TcActionNatOption {
Other(DefaultNla),
}


impl Nla for TcActionNatOption {
fn value_len(&self) -> usize {
match self {
Expand Down
2 changes: 2 additions & 0 deletions src/tc/actions/tests/action.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use crate::tc::{
TcAction, TcActionAttribute, TcActionGeneric, TcActionGenericBuffer,
TcActionType, TcStats2, TcStatsBasic,
Expand Down
2 changes: 2 additions & 0 deletions src/tc/actions/tests/header.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use crate::tc::actions::{TcActionMessageBuffer, TcActionMessageHeader};
use crate::AddressFamily;
use netlink_packet_utils::{Emitable, Parseable};
Expand Down
2 changes: 2 additions & 0 deletions src/tc/actions/tests/message.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use netlink_packet_utils::nla::{DefaultNla, NlaBuffer};
use netlink_packet_utils::{Emitable, Parseable};

Expand Down
12 changes: 7 additions & 5 deletions src/tc/actions/tests/mirror.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// SPDX-License-Identifier: MIT

use netlink_packet_utils::nla::NlaBuffer;
use netlink_packet_utils::{Emitable, Parseable};

use crate::tc::{
TcActionGeneric, TcActionGenericBuffer, TcActionMirrorOption,
TcActionType, TcMirror, TcMirrorActionType, TcMirrorBuffer,
TcActionGeneric, TcActionGenericBuffer, TcActionMirrorOption, TcActionType,
TcMirror, TcMirrorActionType, TcMirrorBuffer,
};

#[test]
Expand All @@ -20,7 +22,7 @@ fn tc_action_generic_parse_back() {
let parsed = TcActionGeneric::parse(
&TcActionGenericBuffer::new_checked(buffer).unwrap(),
)
.unwrap();
.unwrap();
assert_eq!(orig, parsed);
}

Expand All @@ -36,7 +38,7 @@ fn tc_mirror_default_parse_back() {
let parsed = TcMirror::parse(
&TcMirrorBuffer::new_checked(buffer.as_slice()).unwrap(),
)
.unwrap();
.unwrap();
assert_eq!(orig, parsed);
}

Expand All @@ -58,7 +60,7 @@ fn tc_mirror_example_parse_back() {
let parsed = TcMirror::parse(
&TcMirrorBuffer::new_checked(buffer.as_slice()).unwrap(),
)
.unwrap();
.unwrap();
assert_eq!(orig, parsed);
}

Expand Down
4 changes: 3 additions & 1 deletion src/tc/actions/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: MIT

pub mod action;
pub mod header;
pub mod message;
pub mod mirror;
pub mod action;
pub mod nat;
2 changes: 2 additions & 0 deletions src/tc/actions/tests/nat.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// SPDX-License-Identifier: MIT

use std::net::Ipv4Addr;

use netlink_packet_utils::nla::NlaBuffer;
Expand Down

0 comments on commit 4e99be4

Please sign in to comment.