Skip to content
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

Jump to bottom

Rollup of 10 pull requests #120335

Merged
merged 28 commits into from
Jan 25, 2024
Merged

Rollup of 10 pull requests #120335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0e6f7c6
Add AsyncFn family of traits
compiler-errors Dec 20, 2023
fde86e5
We do not need impl_trait_in_assoc_ty
compiler-errors Dec 20, 2023
17b4333
select AsyncFn traits during overloaded call op
compiler-errors Dec 20, 2023
2c2f3ed
Provide more context on recursive `impl` evaluation overflow
estebank Dec 28, 2023
c85bb27
Account for trailing comma in removal suggestion
estebank Dec 28, 2023
29bdf9e
Account for single `where` bound being removed
estebank Jan 4, 2024
db7cd57
Remove track_errors entirely
oli-obk Jan 23, 2024
849d884
Remove --fatal-warnings on wasm targets
djkoloski Jan 23, 2024
83ef18c
coverage: Dismantle `Instrumentor` into ordinary functions
Zalathar Jan 24, 2024
572d7e9
coverage: Flatten the functions for extracting/refining coverage spans
Zalathar Jan 24, 2024
64f590a
Assert that a single scope is passed to `for_scope`
Urgau Jan 22, 2024
cc34dc2
Correctly explain `ensure_forwards_result_if_red`
oli-obk Jan 24, 2024
e088016
Let `ctor_sub_tys` return any Iterator they want
Nadrieril Jan 24, 2024
d992d9c
On E0308 involving `dyn Trait`, mention trait objects
estebank Jan 24, 2024
796814d
Account for expected `dyn Trait` found `impl Trait`
estebank Jan 24, 2024
bdab213
Most of the `DeconstructedPat` `Debug` impl is reusable
Nadrieril Jan 24, 2024
354b45f
Improve `Range: Debug` impl
Nadrieril Jan 24, 2024
8f3af4c
rustc_data_structures: use either instead of itertools
cuviper Jan 24, 2024
8c6cf3c
Rollup merge of #119305 - compiler-errors:async-fn-traits, r=oli-obk
matthiaskrgr Jan 25, 2024
fd92d88
Rollup merge of #119389 - estebank:issue-116925, r=TaKO8Ki
matthiaskrgr Jan 25, 2024
0c45e3c
Rollup merge of #119895 - oli-obk:track_errors_3, r=matthewjasper
matthiaskrgr Jan 25, 2024
55d5ea3
Rollup merge of #120230 - Urgau:for_scope-single-scope, r=michaelwoer…
matthiaskrgr Jan 25, 2024
565961b
Rollup merge of #120278 - djkoloski:remove_fatal_warnings_wasm, r=oli…
matthiaskrgr Jan 25, 2024
72b70ec
Rollup merge of #120292 - Zalathar:dismantle, r=oli-obk
matthiaskrgr Jan 25, 2024
0cbef47
Rollup merge of #120315 - estebank:issue-102629-2, r=wesleywiser
matthiaskrgr Jan 25, 2024
b677c77
Rollup merge of #120317 - Nadrieril:dont-force-slice-of-ty, r=compile…
matthiaskrgr Jan 25, 2024
a1ecced
Rollup merge of #120318 - Nadrieril:share-debug-impl, r=compiler-errors
matthiaskrgr Jan 25, 2024
8c1ba59
Rollup merge of #120325 - cuviper:either-data, r=compiler-errors
matthiaskrgr Jan 25, 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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3654,10 +3654,10 @@ version = "0.0.0"
dependencies = [
"arrayvec",
"bitflags 2.4.1",
"either",
"elsa",
"ena",
"indexmap",
"itertools",
"jobserver",
"libc",
"measureme",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
# tidy-alphabetical-start
arrayvec = { version = "0.7", default-features = false }
bitflags = "2.4.1"
either = "1.0"
elsa = "=1.7.1"
ena = "0.14.2"
indexmap = { version = "2.0.0" }
itertools = "0.11"
jobserver_crate = { version = "0.1.27", package = "jobserver" }
libc = "0.2"
measureme = "11"
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/src/sharded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::fx::{FxHashMap, FxHasher};
use crate::sync::{is_dyn_thread_safe, CacheAligned};
use crate::sync::{Lock, LockGuard, Mode};
#[cfg(parallel_compiler)]
use itertools::Either;
use either::Either;
use std::borrow::Borrow;
use std::collections::hash_map::RawEntryMut;
use std::hash::{Hash, Hasher};
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/src/sso/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::fx::FxHashMap;
use arrayvec::ArrayVec;
use itertools::Either;
use either::Either;
use std::fmt;
use std::hash::Hash;
use std::ops::Index;
Expand Down
4 changes: 4 additions & 0 deletions compiler/rustc_hir/src/lang_items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ language_item_table! {
FnMut, sym::fn_mut, fn_mut_trait, Target::Trait, GenericRequirement::Exact(1);
FnOnce, sym::fn_once, fn_once_trait, Target::Trait, GenericRequirement::Exact(1);

AsyncFn, sym::async_fn, async_fn_trait, Target::Trait, GenericRequirement::Exact(1);
AsyncFnMut, sym::async_fn_mut, async_fn_mut_trait, Target::Trait, GenericRequirement::Exact(1);
AsyncFnOnce, sym::async_fn_once, async_fn_once_trait, Target::Trait, GenericRequirement::Exact(1);

FnOnceOutput, sym::fn_once_output, fn_once_output, Target::AssocTy, GenericRequirement::None;

Iterator, sym::iterator, iterator_trait, Target::Trait, GenericRequirement::Exact(0);
Expand Down
Loading
Loading