Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 6 pull requests #126396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 13, 2024
Merged

Rollup of 6 pull requests #126396

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9bba39c
Improve error message if dependency installation in tidy fails
Kobzol Jun 12, 2024
fac1733
Simplify `try_*` on `Iterator`
slanterns Jun 12, 2024
6d4a825
Add a new trait to retrieve StableMir definition Ty
celinval Jun 13, 2024
c9d880b
compiletest: Move `static_regex!` into `compiletest::util`
Zalathar Jun 11, 2024
e09eedb
compiletest: Stricter parsing of `//@ normalize-*` headers
Zalathar Jun 12, 2024
d87ec03
interpret: update doc comment for find_closest_untracked_caller_location
RalfJung Jun 13, 2024
898b541
add tracking issue for is_none_or
RalfJung Jun 13, 2024
1fc56c9
Rollup merge of #126347 - slanterns:try_simplify, r=scottmcm
fmease Jun 13, 2024
83e2975
Rollup merge of #126348 - Kobzol:venv-debug-error, r=albertlarsan68
fmease Jun 13, 2024
3e96d58
Rollup merge of #126366 - celinval:issue-0080-def-ty, r=oli-obk
fmease Jun 13, 2024
2b5c672
Rollup merge of #126370 - Zalathar:normalize, r=oli-obk
fmease Jun 13, 2024
393b526
Rollup merge of #126379 - RalfJung:find_closest_untracked_caller_loca…
fmease Jun 13, 2024
f1a4f30
Rollup merge of #126384 - RalfJung:is_none_or, r=workingjubilee
fmease Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify try_* on Iterator
  • Loading branch information
@slanterns
slanterns committed Jun 12, 2024
commit fac173392588bcf10c18288f791f2bb4c145d43b
21 changes: 11 additions & 10 deletions library/core/src/iter/traits/iterator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,8 +2080,7 @@ pub trait Iterator {
fn try_collect<B>(&mut self) -> ChangeOutputType<Self::Item, B>
where
Self: Sized,
<Self as Iterator>::Item: Try,
<<Self as Iterator>::Item as Try>::Residual: Residual<B>,
Self::Item: Try<Residual: Residual<B>>,
B: FromIterator<<Self::Item as Try>::Output>,
{
try_process(ByRefSized(self), |i| i.collect())
Expand Down Expand Up @@ -2689,12 +2688,13 @@ pub trait Iterator {
#[inline]
#[unstable(feature = "iterator_try_reduce", reason = "new API", issue = "87053")]
#[rustc_do_not_const_check]
fn try_reduce<F, R>(&mut self, f: F) -> ChangeOutputType<R, Option<R::Output>>
fn try_reduce<R>(
&mut self,
f: impl FnMut(Self::Item, Self::Item) -> R,
) -> ChangeOutputType<R, Option<R::Output>>
where
Self: Sized,
F: FnMut(Self::Item, Self::Item) -> R,
R: Try<Output = Self::Item>,
R::Residual: Residual<Option<Self::Item>>,
R: Try<Output = Self::Item, Residual: Residual<Option<Self::Item>>>,
{
let first = match self.next() {
Some(i) => i,
Expand Down Expand Up @@ -2956,12 +2956,13 @@ pub trait Iterator {
#[inline]
#[unstable(feature = "try_find", reason = "new API", issue = "63178")]
#[rustc_do_not_const_check]
fn try_find<F, R>(&mut self, f: F) -> ChangeOutputType<R, Option<Self::Item>>
fn try_find<R>(
&mut self,
f: impl FnMut(&Self::Item) -> R,
) -> ChangeOutputType<R, Option<Self::Item>>
where
Self: Sized,
F: FnMut(&Self::Item) -> R,
R: Try<Output = bool>,
R::Residual: Residual<Option<Self::Item>>,
R: Try<Output = bool, Residual: Residual<Option<Self::Item>>>,
{
#[inline]
fn check<I, V, R>(
Expand Down