diff options
| author | bors <bors@rust-lang.org> | 2023-01-26 15:58:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-26 15:58:08 +0000 |
| commit | c62665e09c11eb1c9d8ea02df5b723364a0b8ba4 (patch) | |
| tree | a0c4d3611f56418397a874d965fe908390481843 /compiler/rustc_data_structures/src | |
| parent | 3e977638728922d3a6cc7bea34a2fdb8ae97f7c0 (diff) | |
| parent | 4ed8cfc2024a86aa18783a86e9ed51adeef12a63 (diff) | |
| download | rust-c62665e09c11eb1c9d8ea02df5b723364a0b8ba4.tar.gz rust-c62665e09c11eb1c9d8ea02df5b723364a0b8ba4.zip | |
Auto merge of #107328 - matthiaskrgr:rollup-lfqwo0o, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #106904 (Preserve split DWARF files when building archives.) - #106971 (Handle diagnostics customization on the fluent side (for one specific diagnostic)) - #106978 (Migrate mir_build's borrow conflicts) - #107150 (`ty::tls` cleanups) - #107168 (Use a type-alias-impl-trait in `ObligationForest`) - #107189 (Encode info for Adt in a single place.) - #107322 (Custom mir: Add support for some remaining, easy to support constructs) - #107323 (Disable ConstGoto opt in cleanup blocks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/obligation_forest/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/obligation_forest/mod.rs b/compiler/rustc_data_structures/src/obligation_forest/mod.rs index 10e673cd929..dda422c6dd0 100644 --- a/compiler/rustc_data_structures/src/obligation_forest/mod.rs +++ b/compiler/rustc_data_structures/src/obligation_forest/mod.rs @@ -139,8 +139,7 @@ pub enum ProcessResult<O, E> { #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] struct ObligationTreeId(usize); -type ObligationTreeIdGenerator = - std::iter::Map<std::ops::RangeFrom<usize>, fn(usize) -> ObligationTreeId>; +type ObligationTreeIdGenerator = impl Iterator<Item = ObligationTreeId>; pub struct ObligationForest<O: ForestObligation> { /// The list of obligations. In between calls to [Self::process_obligations], |