Skip to content

Commit 4e99be4

Browse files
committed
DROP THIS COMMIT BEFORE MERGE
Scratch commit to make CI run prior to review
1 parent 4dfa69e commit 4e99be4

File tree

13 files changed

+26
-31
lines changed

13 files changed

+26
-31
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: Build
22

3-
on:
4-
pull_request:
5-
types: [opened, synchronize, reopened]
6-
push:
7-
branches:
8-
- main
3+
on: [push]
94

105
jobs:
116
build:

.github/workflows/clippy-rustfmt.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: Rustfmt and clippy check
22

3-
on:
4-
pull_request:
5-
types: [opened, synchronize, reopened]
6-
push:
7-
branches:
8-
- main
3+
on: [push]
94

105
jobs:
116
rustfmt_clippy:

.github/workflows/license.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: license
22

3-
on:
4-
pull_request:
5-
types: [opened, synchronize, reopened]
6-
push:
7-
branches:
8-
- main
3+
on: [push]
94

105
jobs:
116
check-license:

.github/workflows/main.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: CI
22

3-
on:
4-
pull_request:
5-
types: [opened, synchronize, reopened]
6-
push:
7-
branches:
8-
- main
3+
on: [push]
94

105
jobs:
116
ci:

src/tc/actions/header.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use netlink_packet_utils::nla::{NlaBuffer, NlasIterator};
24
use netlink_packet_utils::{DecodeError, Emitable, Parseable};
35

src/tc/actions/message.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use anyhow::Context;
24
use netlink_packet_utils::nla::{DefaultNla, NlaBuffer};
35
use netlink_packet_utils::nla::{Nla, NlasIterator};

src/tc/actions/nat.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pub enum TcActionNatOption {
3737
Other(DefaultNla),
3838
}
3939

40-
4140
impl Nla for TcActionNatOption {
4241
fn value_len(&self) -> usize {
4342
match self {

src/tc/actions/tests/action.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use crate::tc::{
24
TcAction, TcActionAttribute, TcActionGeneric, TcActionGenericBuffer,
35
TcActionType, TcStats2, TcStatsBasic,

src/tc/actions/tests/header.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use crate::tc::actions::{TcActionMessageBuffer, TcActionMessageHeader};
24
use crate::AddressFamily;
35
use netlink_packet_utils::{Emitable, Parseable};

src/tc/actions/tests/message.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use netlink_packet_utils::nla::{DefaultNla, NlaBuffer};
24
use netlink_packet_utils::{Emitable, Parseable};
35

src/tc/actions/tests/mirror.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use netlink_packet_utils::nla::NlaBuffer;
24
use netlink_packet_utils::{Emitable, Parseable};
35

46
use crate::tc::{
5-
TcActionGeneric, TcActionGenericBuffer, TcActionMirrorOption,
6-
TcActionType, TcMirror, TcMirrorActionType, TcMirrorBuffer,
7+
TcActionGeneric, TcActionGenericBuffer, TcActionMirrorOption, TcActionType,
8+
TcMirror, TcMirrorActionType, TcMirrorBuffer,
79
};
810

911
#[test]
@@ -20,7 +22,7 @@ fn tc_action_generic_parse_back() {
2022
let parsed = TcActionGeneric::parse(
2123
&TcActionGenericBuffer::new_checked(buffer).unwrap(),
2224
)
23-
.unwrap();
25+
.unwrap();
2426
assert_eq!(orig, parsed);
2527
}
2628

@@ -36,7 +38,7 @@ fn tc_mirror_default_parse_back() {
3638
let parsed = TcMirror::parse(
3739
&TcMirrorBuffer::new_checked(buffer.as_slice()).unwrap(),
3840
)
39-
.unwrap();
41+
.unwrap();
4042
assert_eq!(orig, parsed);
4143
}
4244

@@ -58,7 +60,7 @@ fn tc_mirror_example_parse_back() {
5860
let parsed = TcMirror::parse(
5961
&TcMirrorBuffer::new_checked(buffer.as_slice()).unwrap(),
6062
)
61-
.unwrap();
63+
.unwrap();
6264
assert_eq!(orig, parsed);
6365
}
6466

src/tc/actions/tests/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
// SPDX-License-Identifier: MIT
2+
3+
pub mod action;
14
pub mod header;
25
pub mod message;
36
pub mod mirror;
4-
pub mod action;
57
pub mod nat;

src/tc/actions/tests/nat.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: MIT
2+
13
use std::net::Ipv4Addr;
24

35
use netlink_packet_utils::nla::NlaBuffer;

0 commit comments

Comments
 (0)