Skip to content

Commit

Permalink
Address review comments and add back some #[inline] attrs from remove…
Browse files Browse the repository at this point in the history
…d commits.
  • Loading branch information
michaelwoerister committed Jan 4, 2024
1 parent 900a11b commit 077540c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions compiler/rustc_data_structures/src/unord.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ impl<T, I: Iterator<Item = T>> UnordItems<T, I> {
self.collect_stable_ord_by_key(project_to_key)
}

#[inline]
pub fn collect_sorted<HCX, C>(self, hcx: &HCX, cache_sort_key: bool) -> C
where
T: ToStableHashKey<HCX>,
Expand All @@ -178,6 +179,7 @@ impl<T, I: Iterator<Item = T>> UnordItems<T, I> {
items
}

#[inline]
pub fn collect_stable_ord_by_key<K, C, P>(self, project_to_key: P) -> C
where
K: StableCompare,
Expand Down
2 changes: 0 additions & 2 deletions compiler/rustc_passes/src/stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,6 @@ pub fn check_unused_or_stable_features(tcx: TyCtxt<'_>) {
tcx.dcx().emit_err(errors::UnknownFeature { span, feature: *feature });
}

// We only use the hash map contents to emit errors, and the order of
// emitted errors do not affect query stability.
for (&implied_by, &feature) in remaining_implications.to_sorted_stable_ord() {
let local_defined_features = tcx.lib_features(LOCAL_CRATE);
let span = local_defined_features
Expand Down

0 comments on commit 077540c

Please sign in to comment.