Skip to content

Commit 6820ac2

Browse files
committed
chore(core): update tasks.json for default build group, change Rust edition to 2024, and migrate rust-toolchain to rust-toolchain.toml
1 parent 1c60209 commit 6820ac2

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

.vscode/tasks.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
"CARGO_PROFILE_RELEASE_DEBUG": "true",
1717
"NX_TUI": "false"
1818
}
19+
},
20+
"group": {
21+
"kind": "build",
22+
"isDefault": true
1923
}
2024

2125
},

packages/nx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = 'nx'
33
version = '0.1.0'
4-
edition = '2021'
4+
edition = '2024'
55

66
[profile.release-wasi]
77
codegen-units = 16

packages/nx/src/native/tui/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use crate::native::{
2222
tasks::types::{Task, TaskResult},
2323
};
2424

25+
use super::components::Component;
2526
use super::components::countdown_popup::CountdownPopup;
2627
use super::components::help_popup::HelpPopup;
2728
use super::components::layout_manager::{
@@ -30,7 +31,6 @@ use super::components::layout_manager::{
3031
use super::components::task_selection_manager::{SelectionMode, TaskSelectionManager};
3132
use super::components::tasks_list::{TaskStatus, TasksList};
3233
use super::components::terminal_pane::{TerminalPane, TerminalPaneData, TerminalPaneState};
33-
use super::components::Component;
3434
use super::config::TuiConfig;
3535
use super::lifecycle::RunMode;
3636
use super::pty::PtyInstance;

packages/nx/src/native/tui/nx_console/ipc_transport.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ impl TransportReceiverT for IpcTransportReceiver {
9595
#[cfg(test)]
9696
mod test_utils {
9797
use super::*;
98-
use std::future::Future;
9998
use std::time::Duration;
99+
use std::{future::Future, path::PathBuf};
100100
use tokio::task;
101101

102102
// Define trait for platform-specific test setup
@@ -196,8 +196,8 @@ mod test_utils {
196196
mod tests {
197197
use super::test_utils::*;
198198
use super::*;
199-
use std::future::Future;
200199
use std::pin::Pin;
200+
use std::{future::Future, path::PathBuf};
201201
use tempfile::NamedTempFile;
202202
use tokio::net::UnixListener;
203203

@@ -238,7 +238,7 @@ mod tests {
238238
}
239239

240240
fn connect_client(path: PathBuf) -> Self::ConnectFuture {
241-
Box::pin(async move { IpcTransport::new(path).await })
241+
Box::pin(async move { IpcTransport::new(&path).await })
242242
}
243243
}
244244

rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.

rust-toolchain.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "1.86.0"
3+
targets = ["wasm32-wasip1-threads"]
4+
profile = "default"

0 commit comments

Comments
 (0)