Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e098eb1

Browse files
committedJan 21, 2023
Auto merge of rust-lang#107143 - compiler-errors:rollup-zabvmo5, r=compiler-errors
Rollup of 9 pull requests Successful merges: - rust-lang#104154 (Change `bindings_with_variant_name` to deny-by-default) - rust-lang#104347 (diagnostics: suggest changing `s@self::{macro}`@::macro`` for exported) - rust-lang#104672 (Unify stable and unstable sort implementations in same core module) - rust-lang#107048 (check for x version updates) - rust-lang#107061 (Implement some more new solver candidates and fix some bugs) - rust-lang#107095 (rustdoc: remove redundant CSS selector `.sidebar .current`) - rust-lang#107112 (Fix typo in opaque_types.rs) - rust-lang#107124 (fix check macro expansion) - rust-lang#107131 (rustdoc: use CSS inline layout for radio line instead of flexbox) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0726909 + 34d4df5 commit e098eb1

Some content is hidden

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

42 files changed

+1086
-410
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5608,6 +5608,7 @@ dependencies = [
56085608
"lazy_static",
56095609
"miropt-test-tools",
56105610
"regex",
5611+
"semver",
56115612
"termcolor",
56125613
"walkdir",
56135614
]

‎compiler/rustc_index/src/vec.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,12 @@ impl<I: Idx, T> IndexVec<I, T> {
207207
&'a mut self,
208208
range: R,
209209
) -> impl Iterator<Item = (I, T)> + 'a {
210-
self.raw.drain(range).enumerate().map(|(n, t)| (I::new(n), t))
210+
let begin = match range.start_bound() {
211+
std::ops::Bound::Included(i) => *i,
212+
std::ops::Bound::Excluded(i) => i.checked_add(1).unwrap(),
213+
std::ops::Bound::Unbounded => 0,
214+
};
215+
self.raw.drain(range).enumerate().map(move |(n, t)| (I::new(begin + n), t))
211216
}
212217

213218
#[inline]

0 commit comments

Comments
 (0)
This repository has been archived.