Skip to content

fix(nargo_fmt): don't consider identifiers the same if they are equal… #7043

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

Merged
asterite merged 2 commits into from
Jan 13, 2025
Merged

fix(nargo_fmt): don't consider identifiers the same if they are equal… #7043

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7985d04
fix(nargo_fmt): don't consider identifiers the same if they are equal…
asterite Jan 13, 2025
8f385f0
Update tooling/nargo_fmt/src/formatter/use_tree_merge.rs
asterite Jan 13, 2025
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
13 changes: 12 additions & 1 deletion tooling/nargo_fmt/src/formatter/use_tree_merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,12 @@ impl Ord for Segment {

if let (Segment::Plain(self_string), Segment::Plain(other_string)) = (self, other) {
// Case-insensitive comparison for plain segments
self_string.to_lowercase().cmp(&other_string.to_lowercase())
let ordering = self_string.to_lowercase().cmp(&other_string.to_lowercase());
if ordering == Ordering::Equal {
self_string.cmp(other_string)
} else {
ordering
}
} else {
order_number_ordering
}
Expand Down Expand Up @@ -620,4 +625,10 @@ use std::merkle::compute_merkle_root;
let expected = "use std::{as_witness, merkle::compute_merkle_root};\n";
assert_format(src, expected);
}

#[test]
fn does_not_merge_same_identifiers_if_equal_case_insensitive() {
let src = "use bigint::{BigNum, bignum::BigNumTrait};\n";
assert_format(src, src);
}
}