Skip to content

Commit 09969d3

Browse files
renovate[bot]epage
andauthored
chore(deps): Update Rust Stable to v1.89 (#6093)
* chore(deps): Update Rust Stable to v1.89 * style: Make clippy happy --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ed Page <eopage@gmail.com>
1 parent 520beb5 commit 09969d3

File tree

5 files changed

+7
-59
lines changed

5 files changed

+7
-59
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
- name: Install Rust
165165
uses: dtolnay/rust-toolchain@stable
166166
with:
167-
toolchain: "1.88" # STABLE
167+
toolchain: "1.89" # STABLE
168168
- uses: Swatinem/rust-cache@v2
169169
- name: UI Tests
170170
run: make test-ui-${{ matrix.features }}
@@ -207,7 +207,7 @@ jobs:
207207
- name: Install Rust
208208
uses: dtolnay/rust-toolchain@stable
209209
with:
210-
toolchain: "1.88" # STABLE
210+
toolchain: "1.89" # STABLE
211211
- uses: Swatinem/rust-cache@v2
212212
- name: Check documentation
213213
env:
@@ -222,7 +222,7 @@ jobs:
222222
- name: Install Rust
223223
uses: dtolnay/rust-toolchain@stable
224224
with:
225-
toolchain: "1.88" # STABLE
225+
toolchain: "1.89" # STABLE
226226
components: rustfmt
227227
- uses: Swatinem/rust-cache@v2
228228
- name: Check formatting
@@ -236,7 +236,7 @@ jobs:
236236
- name: Install Rust
237237
uses: dtolnay/rust-toolchain@stable
238238
with:
239-
toolchain: "1.88" # STABLE
239+
toolchain: "1.89" # STABLE
240240
components: clippy
241241
- uses: Swatinem/rust-cache@v2
242242
- name: Lint (ultra-minimal)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
1010
ARGS+=--target ${TOOLCHAIN_TARGET}
1111
endif
1212

13-
STABLE?=1.88
13+
STABLE?=1.89
1414

1515
_FEATURES = minimal default wasm full debug release
1616
_FEATURES_minimal = --no-default-features --features "std"

clap_builder/src/parser/matches/arg_matches.rs

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,58 +1617,6 @@ impl Default for RawValues<'_> {
16171617
// commit: be5e1fa3c26e351761b33010ddbdaf5f05dbcc33
16181618
// license: MIT - Copyright (c) 2015 The Rust Project Developers
16191619

1620-
#[derive(Clone, Debug)]
1621-
#[deprecated(since = "4.1.0", note = "Use Occurrences instead")]
1622-
pub(crate) struct GroupedValues<'a> {
1623-
#[allow(clippy::type_complexity)]
1624-
iter: Map<Iter<'a, Vec<AnyValue>>, fn(&Vec<AnyValue>) -> Vec<&str>>,
1625-
len: usize,
1626-
}
1627-
1628-
#[allow(deprecated)]
1629-
impl<'a> Iterator for GroupedValues<'a> {
1630-
type Item = Vec<&'a str>;
1631-
1632-
fn next(&mut self) -> Option<Self::Item> {
1633-
if let Some(next) = self.iter.next() {
1634-
self.len -= 1;
1635-
Some(next)
1636-
} else {
1637-
None
1638-
}
1639-
}
1640-
fn size_hint(&self) -> (usize, Option<usize>) {
1641-
(self.len, Some(self.len))
1642-
}
1643-
}
1644-
1645-
#[allow(deprecated)]
1646-
impl DoubleEndedIterator for GroupedValues<'_> {
1647-
fn next_back(&mut self) -> Option<Self::Item> {
1648-
if let Some(next) = self.iter.next_back() {
1649-
self.len -= 1;
1650-
Some(next)
1651-
} else {
1652-
None
1653-
}
1654-
}
1655-
}
1656-
1657-
#[allow(deprecated)]
1658-
impl ExactSizeIterator for GroupedValues<'_> {}
1659-
1660-
/// Creates an empty iterator. Used for `unwrap_or_default()`.
1661-
#[allow(deprecated)]
1662-
impl Default for GroupedValues<'_> {
1663-
fn default() -> Self {
1664-
static EMPTY: [Vec<AnyValue>; 0] = [];
1665-
GroupedValues {
1666-
iter: EMPTY[..].iter().map(|_| unreachable!()),
1667-
len: 0,
1668-
}
1669-
}
1670-
}
1671-
16721620
#[derive(Clone, Debug)]
16731621
pub struct Occurrences<T> {
16741622
#[allow(clippy::type_complexity)]

src/_tutorial.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
//! ### Enumerated values
162162
//!
163163
//! If you have arguments of specific values you want to test for, you can use the
164-
//! [`PossibleValuesParser`][crate::builder::PossibleValuesParser] or [`Arg::value_parser(["val1",
164+
//! [`PossibleValuesParser`] or [`Arg::value_parser(["val1",
165165
//! ...])`][crate::Arg::value_parser] for short.
166166
//!
167167
//! This allows you to specify the valid values for that argument. If the user does not use one of

tests/derive_ui.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![cfg(feature = "unstable-derive-ui-tests")]
99

1010
#[cfg(feature = "derive")]
11-
#[rustversion::attr(not(stable(1.88)), ignore)] // STABLE
11+
#[rustversion::attr(not(stable(1.89)), ignore)] // STABLE
1212
#[test]
1313
fn ui() {
1414
let t = trybuild::TestCases::new();

0 commit comments

Comments
 (0)