Skip to content

fix: refresh Cargo.lock for modern Rust and align toolchain #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hgp22 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: refresh Cargo.lock for modern Rust and align toolchain #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4113d60
fix: refresh Cargo.lock for modern Rust and align toolchain
hgp22 Apr 27, 2026
d5bbf2e
chore: sync Cargo.lock p4-analyzer version with Cargo.toml (0.0.0)
hgp22 Apr 27, 2026
97b7bd8
fix(analyzer-host): use resolved file system when none was provided
hgp22 Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: '1.68'
toolchain: "1.88.0"
target: wasm32-unknown-unknown

- name: Install Wasm-Pack
uses: jetli/wasm-pack-action@v0.4.0
Expand Down
123 changes: 73 additions & 50 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = ["./crates/*"]

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion crates/analyzer-core/src/preprocessor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ mod test {

macro_rules! test_pp {
($str: literal, $vec: expr) => {
test_pp!($str, $vec, vec![]);
test_pp!($str, $vec, vec![])
};
($str: literal, $vec: expr, $errs: expr) => {{
let mut errors = vec![];
Expand Down
2 changes: 1 addition & 1 deletion crates/analyzer-host/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl AnalyzerHost {
*(self.protocol_machine.write().await) = Some(LspProtocolMachine::new(
self.trace_value.clone(),
request_manager.clone(),
self.file_system.clone().unwrap(),
file_system.clone(),
));

match join_all(
Expand Down
2 changes: 1 addition & 1 deletion crates/p4-analyzer-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async-channel = "1.7.1"
serde = "1.0.143"
serde_json = "1.0.83"
js-sys = "0.3.60"
wasm-bindgen = "0.2.63"
wasm-bindgen = "0.2.88"
wasm-bindgen-futures = "0.4.33"
futures = "0.3.25"
console_error_panic_hook = "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"publisher": "P4.org",
"scripts": {
"prebuild": "cargo build && wasm-pack build --target nodejs crates/p4-analyzer-wasm",
"prebuild": "cargo build --locked && wasm-pack build --target nodejs crates/p4-analyzer-wasm",
"build": "run-script-os",
"build:nix": "nx run-many --target=build-nix --all",
"build:windows": "nx run-many --target=build-windows --all",
Expand Down
2 changes: 1 addition & 1 deletion packages/p4-analyzer/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"inputs": [
"default",
{
"runtime": "stat -c %Z crates/p4-analyzer-wasm/pkg/*"
"runtime": "node -e \"const{readdirSync,statSync}=require('fs');const p='crates/p4-analyzer-wasm/pkg';try{readdirSync(p).sort().forEach(f=>process.stdout.write(statSync(p+'/'+f).mtimeMs+' '));}catch(e){process.stdout.write('0')}\""
}
],
"executor": "nx:run-commands",
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2023-04-01"
channel = "1.88.0"
Loading