Skip to content

Commit

Permalink
Bump flake to Rust 1.83.0 (#28)
Browse files Browse the repository at this point in the history
* bump flake to Rust 1.83.0

* is_none_or

---------

Co-authored-by: GearsDatapacks <[email protected]>
  • Loading branch information
PgBiel and GearsDatapacks authored Dec 21, 2024
1 parent 2ed072d commit ee0f957
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions compiler-core/src/analyse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1783,11 +1783,10 @@ fn get_compatible_record_fields<A: std::fmt::Debug>(
};

// The labels must be the same
#[allow(clippy::nonminimal_bool)] // TODO: Bump to Rust 1.83
if !argument
if argument
.label
.as_ref()
.is_some_and(|(_, arg_label)| arg_label == first_label)
.is_none_or(|(_, arg_label)| arg_label != first_label)
{
continue 'next_argument;
}
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
rust-manifest = {
url = "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml";
url = "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml";
flake = false;
};
};
Expand Down

0 comments on commit ee0f957

Please sign in to comment.