Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5bd5d21

Browse files
committedJan 25, 2024
Auto merge of rust-lang#120335 - matthiaskrgr:rollup-2a0y3rd, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#119305 (Add `AsyncFn` family of traits) - rust-lang#119389 (Provide more context on recursive `impl` evaluation overflow) - rust-lang#119895 (Remove `track_errors` entirely) - rust-lang#120230 (Assert that a single scope is passed to `for_scope`) - rust-lang#120278 (Remove --fatal-warnings on wasm targets) - rust-lang#120292 (coverage: Dismantle `Instrumentor` and flatten span refinement) - rust-lang#120315 (On E0308 involving `dyn Trait`, mention trait objects) - rust-lang#120317 (pattern_analysis: Let `ctor_sub_tys` return any Iterator they want) - rust-lang#120318 (pattern_analysis: Reuse most of the `DeconstructedPat` `Debug` impl) - rust-lang#120325 (rustc_data_structures: use either instead of itertools) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d93fecc + 8c1ba59 commit 5bd5d21

File tree

70 files changed

+1588
-601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1588
-601
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3654,10 +3654,10 @@ version = "0.0.0"
36543654
dependencies = [
36553655
"arrayvec",
36563656
"bitflags 2.4.1",
3657+
"either",
36573658
"elsa",
36583659
"ena",
36593660
"indexmap",
3660-
"itertools",
36613661
"jobserver",
36623662
"libc",
36633663
"measureme",

‎compiler/rustc_data_structures/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ edition = "2021"
77
# tidy-alphabetical-start
88
arrayvec = { version = "0.7", default-features = false }
99
bitflags = "2.4.1"
10+
either = "1.0"
1011
elsa = "=1.7.1"
1112
ena = "0.14.2"
1213
indexmap = { version = "2.0.0" }
13-
itertools = "0.11"
1414
jobserver_crate = { version = "0.1.27", package = "jobserver" }
1515
libc = "0.2"
1616
measureme = "11"

0 commit comments

Comments
 (0)
Please sign in to comment.