Repository navigation
Upgrade rust and dependencies - #234
Sha1rholder wants to merge 7 commits into
Conversation
|
looks like you need to rebase on main to get rid of the merge conflict |
97aedab to
ce7169d
Compare
|
@fdncred Nushell's AST parser has changed, and it added 5 test failures (not including the "special cases" in ground_truth.rs), so the CI is no longer passing. I think it might be better to refactor the test-related code first before fixing nufmt. My rough idea is something like this: tests/fixtures/
├ change/
│ ├ input/
│ ├ (git ignored) unexpected/
│ ├ expected/
│ └ (git ignored) not_idempotent/
├ consistent/
└ (git ignored) not_idempotent/
On each test run:
This way, each Nushell script will be and only will be formatted once during the test run, while still verifying correctness and idempotency. It should also make ground_truth.rs much shorter, and make test failures easier to inspect than they are now. Using What do you think? |
|
ok |
deprecating Intel mac as nixos-26.05 is the last version that supports Intel mac
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
The upgrade masks a match-pattern formatting regression and leaves the dependency updater unable to keep all Nushell crates aligned.
Review effort: Balanced
Findings: 1
Open (2)
What changed in this PR
Upgrades nufmt to Rust 2024 and Nushell 0.116, adapting APIs, dependencies, tooling, and formatting fixtures.
Changes:
- Updates Rust/Nushell dependencies and lockfiles.
- Adapts formatter code to updated APIs and output behavior.
- Refreshes Nix configuration, documentation, and update tooling.
| File | Description |
|---|---|
Cargo.toml |
Updates edition and dependencies. |
Cargo.lock |
Refreshes resolved dependencies. |
README.md |
Updates Nushell badge. |
flake.nix |
Moves to unstable nixpkgs and adjusts platforms. |
flake.lock |
Updates the nixpkgs pin. |
scripts/update-nushell-version |
Modernizes dependency-update commands. |
benches/file-format-bench.rs |
Applies updated Rust formatting. |
src/main.rs |
Applies Rust 2024 formatting. |
src/lib.rs |
Reformats debug logging. |
src/formatting/repair.rs |
Adapts parse errors and let chains. |
src/formatting/mod.rs |
Modernizes conditional control flow. |
src/formatting/expressions.rs |
Modernizes expression conditions. |
src/formatting/engine.rs |
Reorders imports. |
src/formatting/comments.rs |
Modernizes comment handling. |
src/formatting/collections.rs |
Modernizes match-pattern handling. |
src/formatting/calls.rs |
Handles the new completion variant. |
src/formatting/blocks.rs |
Modernizes block-spacing conditions. |
tests/fixtures/expected/nested_structures.nu |
Updates nested formatting output. |
tests/fixtures/expected/nested_closure_indentation_normalized_issue159.nu |
Updates nested try formatting. |
tests/fixtures/expected/multiline_pipeline.nu |
Updates record pipeline layout. |
tests/fixtures/expected/identifier_safe_match_patterns_unquoted_issue157.nu |
Changes match-pattern expectations. |
tests/fixtures/expected/def_with_pipeline_double_parens_issue82.nu |
Updates nested block layout. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| "allow" => "ok" | ||
| "deny" => "blocked" | ||
| "ask" => "queued" |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
|
should be rewritten after #237 |



Description of changes
Update rust and dependencies
Relevant Issues
Closes #214