Commit 077540c

committed

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

1 parent 900a11b commit 077540cCopy full SHA for 077540c

File tree

-2

lines changed

compiler
- rustc_data_structures/src
  - unord.rs
- rustc_passes/src
  - stability.rs

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ impl<T, I: Iterator<Item = T>> UnordItems<T, I> {`
`159`	`159`	`self.collect_stable_ord_by_key(project_to_key)`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ #[inline]`
`162`	`163`	`pub fn collect_sorted<HCX, C>(self, hcx: &HCX, cache_sort_key: bool) -> C`
`163`	`164`	`where`
`164`	`165`	`T: ToStableHashKey<HCX>,`
`@@ -178,6 +179,7 @@ impl<T, I: Iterator<Item = T>> UnordItems<T, I> {`
`178`	`179`	`items`
`179`	`180`	`}`
`180`	`181`
	`182`	`+ #[inline]`
`181`	`183`	`pub fn collect_stable_ord_by_key<K, C, P>(self, project_to_key: P) -> C`
`182`	`184`	`where`
`183`	`185`	`K: StableCompare,`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1052,8 +1052,6 @@ pub fn check_unused_or_stable_features(tcx: TyCtxt<'_>) {`
`1052`	`1052`	`tcx.dcx().emit_err(errors::UnknownFeature { span, feature: *feature });`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`		`- // We only use the hash map contents to emit errors, and the order of`
`1056`		`- // emitted errors do not affect query stability.`
`1057`	`1055`	`for (&implied_by, &feature) in remaining_implications.to_sorted_stable_ord() {`
`1058`	`1056`	`let local_defined_features = tcx.lib_features(LOCAL_CRATE);`
`1059`	`1057`	`let span = local_defined_features`

Comments

(0)