Skip to content

Commit 4529571

Browse files
authored
Merge branch 'master' into main
2 parents 58e99c3 + e98af36 commit 4529571

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ equatable_if_let = "warn"
5959
explicit_into_iter_loop = "warn"
6060
explicit_iter_loop = "warn"
6161
flat_map_option = "warn"
62-
from_iter_instead_of_collect = "warn"
6362
if_then_some_else_none = "warn"
6463
implicit_clone = "warn"
6564
if_not_else = "warn"

crates/common/src/calc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn mean(values: &[u64]) -> u64 {
1010
}
1111

1212
/// Returns the median of a _sorted_ slice.
13-
pub fn median_sorted(values: &[u64]) -> u64 {
13+
pub const fn median_sorted(values: &[u64]) -> u64 {
1414
if values.is_empty() {
1515
return 0;
1616
}

crates/fmt/src/state/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl CallStack {
8888

8989
/// Returns true if the direct parent chain has its own indentation.
9090
/// Used to determine if commasep should skip its own indentation (to avoid double indent).
91-
pub(crate) fn has_indented_parent_chain(&self) -> bool {
91+
pub(crate) const fn has_indented_parent_chain(&self) -> bool {
9292
matches!(
9393
self.stack.as_slice(),
9494
[.., parent, last] if last.is_nested() && parent.is_chained() && parent.has_indent

0 commit comments

Comments
 (0)