Skip to content

Commit 3213341

Browse files
authored
Merge branch 'master' into include_uninlined_format_args
2 parents 2a30aaa + 306f624 commit 3213341

4 files changed

Lines changed: 3 additions & 5 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ used_underscore_binding = { level = "allow", priority = 1 }
7070
ref_option = { level = "allow", priority = 1 }
7171
unnecessary_semicolon = { level = "allow", priority = 1 }
7272
elidable_lifetime_names = { level = "allow", priority = 1 }
73-
manual_midpoint = { level = "allow", priority = 1 }
7473
# restriction-lints:
7574
absolute_paths = { level = "allow", priority = 1 }
7675
arithmetic_side_effects = { level = "allow", priority = 1 }
@@ -146,7 +145,6 @@ used_underscore_items = { level = "allow", priority = 1 }
146145
arbitrary_source_item_ordering = { level = "allow", priority = 1 }
147146
map_with_unused_argument_over_ranges = { level = "allow", priority = 1 }
148147
precedence_bits = { level = "allow", priority = 1 }
149-
string_to_string = { level = "allow", priority = 1 }
150148
# nursery-lints:
151149
branches_sharing_code = { level = "allow", priority = 1 }
152150
cognitive_complexity = { level = "allow", priority = 1 }

src/ciphers/transposition.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ fn decrypt(mut msg: String, key_order: Vec<usize>) -> String {
161161

162162
for key in key_order {
163163
if let Some((_, column)) = indexed_vec.iter().find(|(key_index, _)| key_index == &key) {
164-
decrypted_vec.push(column.to_string());
164+
decrypted_vec.push(column.clone());
165165
}
166166
}
167167

src/math/interquartile_range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn find_median(numbers: &[f64]) -> f64 {
1313
let mid = length / 2;
1414

1515
if length % 2 == 0 {
16-
(numbers[mid - 1] + numbers[mid]) / 2.0
16+
f64::midpoint(numbers[mid - 1], numbers[mid])
1717
} else {
1818
numbers[mid]
1919
}

src/math/perfect_square.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn perfect_square_binary_search(n: i32) -> bool {
1818
let mut right = n;
1919

2020
while left <= right {
21-
let mid = (left + right) / 2;
21+
let mid = i32::midpoint(left, right);
2222
let mid_squared = mid * mid;
2323

2424
match mid_squared.cmp(&n) {

0 commit comments

Comments
 (0)