Skip to content

Commit

Permalink
Toolchain to 1.84 (#5968)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertbastian authored Jan 9, 2025
1 parent 3f7a638 commit 4c760e8
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 122 deletions.
2 changes: 1 addition & 1 deletion components/datetime/src/pattern/names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,7 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
}
}

impl<'data> RawDateTimeNamesBorrowed<'data> {
impl RawDateTimeNamesBorrowed<'_> {
pub(crate) fn get_name_for_month(
&self,
field_symbol: fields::Month,
Expand Down
2 changes: 1 addition & 1 deletion components/datetime/src/provider/packed_pattern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ mod _serde {
}

#[cfg(test)]
pub mod tests {
mod tests {
use super::*;
use crate::provider::pattern::reference;

Expand Down
4 changes: 2 additions & 2 deletions components/decimal/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ pub struct DecimalSymbolStrsBuilder<'data> {
pub numsys: Cow<'data, str>,
}

impl<'data> DecimalSymbolStrsBuilder<'data> {
impl DecimalSymbolStrsBuilder<'_> {
/// Build a [`DecimalSymbolsStrs`]
pub fn build(&self) -> VarZeroCow<'static, DecimalSymbolsStrs> {
VarZeroCow::from_encodeable(self)
Expand Down Expand Up @@ -244,7 +244,7 @@ pub struct DecimalDigitsV1 {
pub digits: [char; 10],
}

impl<'data> DecimalSymbolsV2<'data> {
impl DecimalSymbolsV2<'_> {
/// Return (prefix, suffix) for the minus sign
pub fn minus_sign_affixes(&self) -> (&str, &str) {
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub struct FormattedCompactCurrency<'l> {

writeable::impl_display_with_writeable!(FormattedCompactCurrency<'_>);

impl<'l> Writeable for FormattedCompactCurrency<'l> {
impl Writeable for FormattedCompactCurrency<'_> {
fn write_to<W>(&self, sink: &mut W) -> core::result::Result<(), core::fmt::Error>
where
W: core::fmt::Write + ?Sized,
Expand Down
2 changes: 1 addition & 1 deletion components/pattern/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ pub trait PlaceholderValueProvider<K> {
fn map_literal<'a, 'l>(&'a self, literal: &'l str) -> Self::L<'a, 'l>;
}

impl<'b, K, T> PlaceholderValueProvider<K> for &'b T
impl<K, T> PlaceholderValueProvider<K> for &'_ T
where
T: PlaceholderValueProvider<K> + ?Sized,
{
Expand Down
5 changes: 2 additions & 3 deletions components/plurals/src/rules/reference/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ fn test_and_condition(condition: &ast::AndCondition, operands: &PluralOperands)
}

fn test_relation(relation: &ast::Relation, operands: &PluralOperands) -> bool {
calculate_expression(&relation.expression, operands).map_or(false, |exp| {
test_range(&relation.range_list, exp, relation.operator)
})
calculate_expression(&relation.expression, operands)
.is_some_and(|exp| test_range(&relation.range_list, exp, relation.operator))
}

// UTS 35 Part 2 Section 5.1 specifies that CLDR rules contain only integer values.
Expand Down
2 changes: 1 addition & 1 deletion components/timezone/src/ids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ pub struct TimeZoneBcp47Iter<'a> {
inner: ZeroSliceIter<'a, TimeZoneBcp47Id>,
}

impl<'a> Iterator for TimeZoneBcp47Iter<'a> {
impl Iterator for TimeZoneBcp47Iter<'_> {
type Item = TimeZoneBcp47Id;

fn next(&mut self) -> Option<Self::Item> {
Expand Down
208 changes: 104 additions & 104 deletions provider/data/experimental/data/currency_displayname_v1_marker.rs.data

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[toolchain]
# Version updated on 2024-07-25
channel = "1.82"
channel = "1.84"
4 changes: 2 additions & 2 deletions utils/fixed_decimal/src/variations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// called LICENSE at the top level of the ICU4X source tree
// (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).

/// This module defines variations of numeric types, including signed values,
/// values with infinity, and values with NaN.
//! This module defines variations of numeric types, including signed values,
//! values with infinity, and values with NaN.
// TODO: move to sign.rs
/// A specification of the sign used when formatting a number.
Expand Down
2 changes: 1 addition & 1 deletion utils/ixdtf/src/parsers/annotations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ fn parse_annotation_value<'a>(cursor: &mut Cursor<'a>) -> ParserResult<&'a [u8]>

if is_hyphen(potential_value_char) {
assert_syntax!(
cursor.peek().map_or(false, is_annotation_value_component),
cursor.peek().is_some_and(is_annotation_value_component),
AnnotationValueCharPostHyphen,
);
cursor.advance();
Expand Down
2 changes: 1 addition & 1 deletion utils/ixdtf/src/parsers/timezone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub(crate) fn parse_date_time_utc(cursor: &mut Cursor) -> ParserResult<UtcOffset
return Ok(UtcOffsetRecordOrZ::Z);
}

let separated = cursor.peek_n(3).map_or(false, is_time_separator);
let separated = cursor.peek_n(3).is_some_and(is_time_separator);

let (mut utc_to_minute, parsed_minute) = parse_utc_offset_minute_precision(cursor)?;

Expand Down
3 changes: 2 additions & 1 deletion utils/zerotrie/src/byte_phf/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ where
pub fn as_bytes(&self) -> &[u8] {
self.0.as_ref()
}

#[cfg(all(feature = "alloc", test))]
pub fn check(&self) -> Result<(), (&'static str, u8)> {
pub(crate) fn check(&self) -> Result<(), (&'static str, u8)> {
use alloc::vec;
let len = self.num_items();
let mut seen = vec![false; len];
Expand Down
4 changes: 2 additions & 2 deletions utils/zerotrie/src/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ pub(crate) fn get_parameterized<T: ZeroTrieWithOptions + ?Sized>(
if matches!(byte_type, NodeType::Ascii) {
let is_match = if matches!(T::OPTIONS.case_sensitivity, CaseSensitivity::IgnoreCase)
{
b.to_ascii_lowercase() == c.to_ascii_lowercase()
b.eq_ignore_ascii_case(c)
} else {
b == c
};
Expand Down Expand Up @@ -446,7 +446,7 @@ pub(crate) fn step_parameterized<T: ZeroTrieWithOptions + ?Sized>(
NodeType::Ascii => {
let is_match = if matches!(T::OPTIONS.case_sensitivity, CaseSensitivity::IgnoreCase)
{
b.to_ascii_lowercase() == c.to_ascii_lowercase()
b.eq_ignore_ascii_case(&c)
} else {
*b == c
};
Expand Down

0 comments on commit 4c760e8

Please sign in to comment.