Skip to content

Commit

Permalink
update rust 1.84.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yanganto committed Jan 10, 2025
1 parent abcf175 commit 0b0c8cc
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@ jobs:
run: nix develop -c cargo fmt

- name: Lint
run: nix develop -c cargo clippy -- -Dwarnings
run: |
nix develop -c cargo clippy -- -Dwarnings
nix develop -c cargo clippy --no-default-features -- -Dwarnings
nix develop -c cargo clippy --features=std -- -Dwarnings
nix develop -c cargo clippy --features=merge -- -Dwarnings
nix develop -c cargo clippy --features=option -- -Dwarnings
nix develop -c cargo clippy --features=none_as_default -- -Dwarnings
nix develop -c cargo clippy --features=keep_none -- -Dwarnings
24 changes: 12 additions & 12 deletions flake.lock

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

6 changes: 3 additions & 3 deletions struct-patch/examples/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn main() {

item.apply(patch);

assert_eq!(item.field_complete, false);
assert!(!item.field_complete);
assert_eq!(item.field_int, 7);
assert_eq!(item.field_string, "");

Expand All @@ -44,7 +44,7 @@ fn main() {
};
let new_item = item << another_patch;

assert_eq!(new_item.field_complete, false);
assert!(!new_item.field_complete);
assert_eq!(new_item.field_int, 7);
assert_eq!(new_item.field_string, "from another patch");

Expand All @@ -54,7 +54,7 @@ fn main() {
field_string: None,
};
let final_item = new_item << the_other_patch;
assert_eq!(final_item.field_complete, true);
assert!(final_item.field_complete);
assert_eq!(final_item.field_int, 7);
assert_eq!(final_item.field_string, "from another patch");
}
Expand Down
6 changes: 3 additions & 3 deletions struct-patch/examples/op.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn main() {

item.apply(patch);

assert_eq!(item.field_complete, false);
assert!(!item.field_complete);
assert_eq!(item.field_int, 7);
assert_eq!(item.field_string, "");

Expand Down Expand Up @@ -78,11 +78,11 @@ fn main() {
final_item_from_merge.field_string,
"from another patch, the other patch"
);
assert_eq!(final_item_from_merge.field_complete, true);
assert!(final_item_from_merge.field_complete);

let final_item_series_patch = item << another_patch << the_other_patch;
assert_eq!(final_item_series_patch.field_string, "the other patch");
assert_eq!(final_item_series_patch.field_complete, true);
assert!(final_item_series_patch.field_complete);
}

#[cfg(not(feature = "op"))]
Expand Down

0 comments on commit 0b0c8cc

Please sign in to comment.