nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments and add back some #[inline] attrs from removed commits.

Browse Source
This commit is contained in:
Michael Woerister 2024-01-04 13:51:06 +01:00
parent 900a11bbec
commit 077540cedf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_data_structures/src/unord.rs
View File

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

2
compiler/rustc_passes/src/stability.rs
View File

@ -1052,8 +1052,6 @@ pub fn check_unused_or_stable_features(tcx: TyCtxt<'_>) {
tcx.dcx().emit_err(errors::UnknownFeature { span, feature: *feature }); 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() { for (&implied_by, &feature) in remaining_implications.to_sorted_stable_ord() {
let local_defined_features = tcx.lib_features(LOCAL_CRATE); let local_defined_features = tcx.lib_features(LOCAL_CRATE);
let span = local_defined_features let span = local_defined_features