Skip to content

Commit f31e718

Browse files
authored
Merge pull request #3238 from marxin/simplify-StackResources-new
Simplify construction of StackResources::new()
2 parents 891c5ee + 961ec38 commit f31e718

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

tests/nrf/src/bin/ethernet_enc28j60_perf.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,7 @@ async fn main(spawner: Spawner) {
6767
// Init network stack
6868
static STACK: StaticCell<Stack<MyDriver>> = StaticCell::new();
6969
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
70-
let stack = &*STACK.init(Stack::new(
71-
device,
72-
config,
73-
RESOURCES.init(StackResources::<2>::new()),
74-
seed,
75-
));
70+
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
7671

7772
unwrap!(spawner.spawn(net_task(stack)));
7873

tests/nrf/src/bin/wifi_esp_hosted_perf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ async fn main(spawner: Spawner) {
9191
let stack = &*STACK.init(Stack::new(
9292
device,
9393
Config::dhcpv4(Default::default()),
94-
RESOURCES.init(StackResources::<2>::new()),
94+
RESOURCES.init(StackResources::new()),
9595
seed,
9696
));
9797

tests/rp/src/bin/cyw43-perf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ async fn main(spawner: Spawner) {
7474
let stack = &*STACK.init(Stack::new(
7575
net_device,
7676
Config::dhcpv4(Default::default()),
77-
RESOURCES.init(StackResources::<2>::new()),
77+
RESOURCES.init(StackResources::new()),
7878
seed,
7979
));
8080

tests/rp/src/bin/ethernet_w5100s_perf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ async fn main(spawner: Spawner) {
7272
let stack = &*STACK.init(Stack::new(
7373
device,
7474
embassy_net::Config::dhcpv4(Default::default()),
75-
RESOURCES.init(StackResources::<2>::new()),
75+
RESOURCES.init(StackResources::new()),
7676
seed,
7777
));
7878

tests/stm32/src/bin/eth.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,7 @@ async fn main(spawner: Spawner) {
101101
// Init network stack
102102
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
103103
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
104-
let stack = &*STACK.init(Stack::new(
105-
device,
106-
config,
107-
RESOURCES.init(StackResources::<2>::new()),
108-
seed,
109-
));
104+
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
110105

111106
// Launch network task
112107
unwrap!(spawner.spawn(net_task(&stack)));

0 commit comments

Comments
 (0)