Skip to content

Commit 141f4f8

Browse files
authored
Fix clippy warnings after rust update (#1476)
1 parent a142df1 commit 141f4f8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scarb/src/internal/serdex.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ impl TryFrom<&str> for MergeStrategy {
3232
/// If `source` and `target` are tables and a specific key exists in both, the conflict will be
3333
/// resolved as follows:
3434
/// 1) If value under the conflicting key in either `source` or `target` is not a table, the value
35-
/// in `target` will be overridden with the value from `source`. This means that no keys from
36-
/// subtables under the conflicting key will be preserved.
35+
/// in `target` will be overridden with the value from `source`. This means that no keys from
36+
/// subtables under the conflicting key will be preserved.
3737
/// 2) If values under the conflicting key in both `source` and `target` are tables,
38-
/// the conflict will be resolved with one of two strategies defined by `source`:
38+
/// the conflict will be resolved with one of two strategies defined by `source`:
3939
/// a) If `source` have a key `merge-strategy` with value `override`, the value in `target` will
4040
/// be overridden with the value from `source`.
4141
/// b) If `source` have a key `merge-strategy` with value `merge`, the value in `target` will be

0 commit comments

Comments
 (0)