Skip to content

Commit

Permalink
Code Refactoring: Curate More Unused Declarations (#636)
Browse files Browse the repository at this point in the history
Refactor base library to avoid warnings of the improved unused
declaration detection, see bug fix
dfinity/motoko#4560 for
dfinity/motoko#4508.
  • Loading branch information
luc-blaeser committed Jun 7, 2024
1 parent f2b7a63 commit e4d3262
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/AssocList.mo
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ module {
case (?((k, v1), tl)) {
switch (find<K, W>(map2, k, equal)) {
case (null) { ?((k, v1), rec(tl)) };
case (?v2) { rec(tl) }
case (?_v2) { rec(tl) }
}
}
}
Expand Down Expand Up @@ -310,7 +310,7 @@ module {
case (?((k, v1), tl)) {
switch (find<K, W>(map2, k, equal)) {
case (null) { ?((k, combine(?v1, null)), rec1(tl)) };
case (?v2) { /* handled above */ rec1(tl) }
case (?_v2) { /* handled above */ rec1(tl) }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Deque.mo
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ module {
///
public func peekFront<T>(deque : Deque<T>) : ?T {
switch deque {
case (?(x, f), r) { ?x };
case (null, ?(x, r)) { ?x };
case (?(x, _f), _r) { ?x };
case (null, ?(x, _r)) { ?x };
case _ { null }
}
};
Expand Down Expand Up @@ -196,8 +196,8 @@ module {
///
public func peekBack<T>(deque : Deque<T>) : ?T {
switch deque {
case (f, ?(x, r)) { ?x };
case (?(x, r), null) { ?x };
case (_f, ?(x, _r)) { ?x };
case (?(x, _r), null) { ?x };
case _ { null }
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/List.mo
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ module {
public func get<T>(l : List<T>, n : Nat) : ?T {
switch (n, l) {
case (_, null) { null };
case (0, (?(h, t))) { ?h };
case (0, (?(h, _))) { ?h };
case (_, (?(_, t))) { get<T>(t, n - 1) }
}
};
Expand Down Expand Up @@ -421,7 +421,7 @@ module {
switch (l, n) {
case (l_, 0) { l_ };
case (null, _) { null };
case ((?(h, t)), m) { drop<T>(t, m - 1) }
case ((?(_, t)), m) { drop<T>(t, m - 1) }
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/RBTree.mo
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ module {
func getRec<X, Y>(x : X, compare : (X, X) -> O.Order, t : Tree<X, Y>) : ?Y {
switch t {
case (#leaf) { null };
case (#node(c, l, xy, r)) {
case (#node(_c, l, xy, r)) {
switch (compare(x, xy.0)) {
case (#less) { getRec(x, compare, l) };
case (#equal) { xy.1 };
Expand Down
2 changes: 1 addition & 1 deletion src/Stack.mo
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module {
public func peek() : ?T {
switch stack {
case null { null };
case (?(h, t)) { ?h }
case (?(h, _)) { ?h }
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/Text.mo
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ module {
case (#success) {
return true
};
case (#empty(cs1)) {
case (#empty(_cs1)) {
return false
};
case (#fail(cs1, c)) {
Expand Down Expand Up @@ -745,7 +745,7 @@ module {
case (#success) {
matchSize += size
}; // continue
case (#empty(cs3)) {
case (#empty(_cs3)) {
switch (cs1.next()) {
case null break l;
case (?_) return t
Expand Down
2 changes: 1 addition & 1 deletion src/TrieSet.mo
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module {
stack := stack2;
next()
};
case (#leaf({ size = c; keyvals = ?((k, v), kvs) })) {
case (#leaf({ size = c; keyvals = ?((k, _v), kvs) })) {
stack := ?(#leaf({ size = c - 1; keyvals = kvs }), stack2);
?k
};
Expand Down
14 changes: 7 additions & 7 deletions test/Option.test.mo
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ do {
let expected : ?Bool = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand All @@ -30,7 +30,7 @@ do {
let expected : ?Bool = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand All @@ -50,7 +50,7 @@ do {
let expected : ?Bool = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand Down Expand Up @@ -99,7 +99,7 @@ do {
let expected : ?Int = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand All @@ -123,7 +123,7 @@ do {
let expected : ?Int = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand Down Expand Up @@ -168,7 +168,7 @@ do {
let expected : ?Int = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand Down Expand Up @@ -208,7 +208,7 @@ do {
let expected : ?Bool = null;

switch (actual, expected) {
case (?actual_, ?expected_) {
case (?_actual_, ?_expected_) {
assert (false)
};
case (_, _) {
Expand Down

0 comments on commit e4d3262

Please sign in to comment.