Skip to content

Commit 54d7b32

Browse files
ndrewxiendrewxie
committed
Removed stable/unstable sort arg from into_sorted_stable_ord, fixed a few misc issues, added collect to UnordItems
1 parent f5f638c commit 54d7b32

File tree

13 files changed

+81
-48
lines changed

13 files changed

+81
-48
lines changed

‎compiler/rustc_abi/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,9 @@ pub struct Size {
414414
// Safety: Ord is implement as just comparing numerical values and numerical values
415415
// are not changed by (de-)serialization.
416416
#[cfg(feature = "nightly")]
417-
unsafe impl StableOrd for Size {}
417+
unsafe impl StableOrd for Size {
418+
const CAN_USE_UNSTABLE_SORT: bool = true;
419+
}
418420

419421
// This is debug-printed a lot in larger structs, don't waste too much space there
420422
impl fmt::Debug for Size {

‎compiler/rustc_data_structures/src/stable_hasher.rs

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,17 @@ pub trait ToStableHashKey<HCX> {
233233
/// - `DefIndex`, `CrateNum`, `LocalDefId`, because their concrete
234234
/// values depend on state that might be different between
235235
/// compilation sessions.
236-
pub unsafe trait StableOrd: Ord {}
236+
///
237+
/// The associated constant `CAN_USE_UNSTABLE_SORT` denotes whether
238+
/// unstable sorting can be used for this type. Set to true if and
239+
/// only if `a == b` implies `a` and `b` are fully indistinguishable.
240+
pub unsafe trait StableOrd: Ord {
241+
const CAN_USE_UNSTABLE_SORT: bool;
242+
}
243+
244+
unsafe impl<T: StableOrd> StableOrd for &T {
245+
const CAN_USE_UNSTABLE_SORT: bool = T::CAN_USE_UNSTABLE_SORT;
246+
}
237247

238248
/// Implement HashStable by just calling `Hash::hash()`. Also implement `StableOrd` for the type since
239249
/// that has the same requirements.
@@ -253,7 +263,9 @@ macro_rules! impl_stable_traits_for_trivial_type {
253263
}
254264
}
255265

256-
unsafe impl $crate::stable_hasher::StableOrd for $t {}
266+
unsafe impl $crate::stable_hasher::StableOrd for $t {
267+
const CAN_USE_UNSTABLE_SORT: bool = true;
268+
}
257269
};
258270
}
259271

@@ -339,7 +351,9 @@ impl<T1: HashStable<CTX>, T2: HashStable<CTX>, CTX> HashStable<CTX> for (T1, T2)
339351
}
340352
}
341353

342-
unsafe impl<T1: StableOrd, T2: StableOrd> StableOrd for (T1, T2) {}
354+
unsafe impl<T1: StableOrd, T2: StableOrd> StableOrd for (T1, T2) {
355+
const CAN_USE_UNSTABLE_SORT: bool = T1::CAN_USE_UNSTABLE_SORT && T2::CAN_USE_UNSTABLE_SORT;
356+
}
343357

344358
impl<T1, T2, T3, CTX> HashStable<CTX> for (T1, T2, T3)
345359
where
@@ -355,7 +369,10 @@ where
355369
}
356370
}
357371

358-
unsafe impl<T1: StableOrd, T2: StableOrd, T3: StableOrd> StableOrd for (T1, T2, T3) {}
372+
unsafe impl<T1: StableOrd, T2: StableOrd, T3: StableOrd> StableOrd for (T1, T2, T3) {
373+
const CAN_USE_UNSTABLE_SORT: bool =
374+
T1::CAN_USE_UNSTABLE_SORT && T2::CAN_USE_UNSTABLE_SORT && T3::CAN_USE_UNSTABLE_SORT;
375+
}
359376

360377
impl<T1, T2, T3, T4, CTX> HashStable<CTX> for (T1, T2, T3, T4)
361378
where
@@ -376,6 +393,10 @@ where
376393
unsafe impl<T1: StableOrd, T2: StableOrd, T3: StableOrd, T4: StableOrd> StableOrd
377394
for (T1, T2, T3, T4)
378395
{
396+
const CAN_USE_UNSTABLE_SORT: bool = T1::CAN_USE_UNSTABLE_SORT
397+
&& T2::CAN_USE_UNSTABLE_SORT
398+
&& T3::CAN_USE_UNSTABLE_SORT
399+
&& T4::CAN_USE_UNSTABLE_SORT;
379400
}
380401

381402
impl<T: HashStable<CTX>, CTX> HashStable<CTX> for [T] {
@@ -468,7 +489,9 @@ impl<CTX> HashStable<CTX> for str {
468489
}
469490
}
470491

471-
unsafe impl StableOrd for &str {}
492+
unsafe impl StableOrd for &str {
493+
const CAN_USE_UNSTABLE_SORT: bool = true;
494+
}
472495

473496
impl<CTX> HashStable<CTX> for String {
474497
#[inline]
@@ -479,7 +502,9 @@ impl<CTX> HashStable<CTX> for String {
479502

480503
// Safety: String comparison only depends on their contents and the
481504
// contents are not changed by (de-)serialization.
482-
unsafe impl StableOrd for String {}
505+
unsafe impl StableOrd for String {
506+
const CAN_USE_UNSTABLE_SORT: bool = true;
507+
}
483508

484509
impl<HCX> ToStableHashKey<HCX> for String {
485510
type KeyType = String;
@@ -505,7 +530,9 @@ impl<CTX> HashStable<CTX> for bool {
505530
}
506531

507532
// Safety: sort order of bools is not changed by (de-)serialization.
508-
unsafe impl StableOrd for bool {}
533+
unsafe impl StableOrd for bool {
534+
const CAN_USE_UNSTABLE_SORT: bool = true;
535+
}
509536

510537
impl<T, CTX> HashStable<CTX> for Option<T>
511538
where
@@ -523,7 +550,9 @@ where
523550
}
524551

525552
// Safety: the Option wrapper does not add instability to comparison.
526-
unsafe impl<T: StableOrd> StableOrd for Option<T> {}
553+
unsafe impl<T: StableOrd> StableOrd for Option<T> {
554+
const CAN_USE_UNSTABLE_SORT: bool = T::CAN_USE_UNSTABLE_SORT;
555+
}
527556

528557
impl<T1, T2, CTX> HashStable<CTX> for Result<T1, T2>
529558
where

‎compiler/rustc_data_structures/src/unord.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ impl<T: Ord, I: Iterator<Item = T>> UnordItems<T, I> {
140140
}
141141

142142
#[inline]
143-
pub fn into_sorted_stable_ord(self, use_stable_sort: bool) -> Vec<T>
143+
pub fn into_sorted_stable_ord(self) -> Vec<T>
144144
where
145145
T: Ord + StableOrd,
146146
{
147147
let mut items: Vec<T> = self.0.collect();
148-
if use_stable_sort {
148+
if !T::CAN_USE_UNSTABLE_SORT {
149149
items.sort();
150150
} else {
151151
items.sort_unstable()
@@ -161,6 +161,10 @@ impl<T: Ord, I: Iterator<Item = T>> UnordItems<T, I> {
161161
items.sort_by_cached_key(|x| x.to_stable_hash_key(hcx));
162162
items
163163
}
164+
165+
pub fn collect<C: From<UnordItems<T, I>>>(self) -> C {
166+
self.into()
167+
}
164168
}
165169

166170
/// This is a set collection type that tries very hard to not expose

‎compiler/rustc_hir/src/hir_id.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ impl ItemLocalId {
166166

167167
// Safety: Ord is implement as just comparing the ItemLocalId's numerical
168168
// values and these are not changed by (de-)serialization.
169-
unsafe impl StableOrd for ItemLocalId {}
169+
unsafe impl StableOrd for ItemLocalId {
170+
const CAN_USE_UNSTABLE_SORT: bool = true;
171+
}
170172

171173
/// The `HirId` corresponding to `CRATE_NODE_ID` and `CRATE_DEF_ID`.
172174
pub const CRATE_HIR_ID: HirId =

‎compiler/rustc_incremental/src/assert_module_sources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl<'tcx> AssertModuleSource<'tcx> {
119119

120120
if !self.available_cgus.contains(&cgu_name) {
121121
let cgu_names: Vec<&str> =
122-
self.available_cgus.items().map(|cgu| cgu.as_str()).into_sorted_stable_ord(true);
122+
self.available_cgus.items().map(|cgu| cgu.as_str()).into_sorted_stable_ord();
123123
self.tcx.sess.emit_err(errors::NoModuleNamed {
124124
span: attr.span,
125125
user_path,

‎compiler/rustc_incremental/src/persist/dirty_clean.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<'tcx> DirtyCleanVisitor<'tcx> {
198198
let (name, mut auto) = self.auto_labels(item_id, attr);
199199
let except = self.except(attr);
200200
let loaded_from_disk = self.loaded_from_disk(attr);
201-
for e in except.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
201+
for e in except.items().map(|x| x.as_str()).into_sorted_stable_ord() {
202202
if !auto.remove(e) {
203203
self.tcx.sess.emit_fatal(errors::AssertionAuto { span: attr.span, name, e });
204204
}
@@ -377,16 +377,16 @@ impl<'tcx> DirtyCleanVisitor<'tcx> {
377377
continue;
378378
};
379379
self.checked_attrs.insert(attr.id);
380-
for label in assertion.clean.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
380+
for label in assertion.clean.items().map(|x| x.as_str()).into_sorted_stable_ord() {
381381
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
382382
self.assert_clean(item_span, dep_node);
383383
}
384-
for label in assertion.dirty.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
384+
for label in assertion.dirty.items().map(|x| x.as_str()).into_sorted_stable_ord() {
385385
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
386386
self.assert_dirty(item_span, dep_node);
387387
}
388388
for label in
389-
assertion.loaded_from_disk.items().map(|x| x.as_str()).into_sorted_stable_ord(false)
389+
assertion.loaded_from_disk.items().map(|x| x.as_str()).into_sorted_stable_ord()
390390
{
391391
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
392392
self.assert_loaded_from_disk(item_span, dep_node);

‎compiler/rustc_incremental/src/persist/fs.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,8 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
676676

677677
// Delete all lock files, that don't have an associated directory. They must
678678
// be some kind of leftover
679-
let lock_file_to_session_dir_iter = lock_file_to_session_dir
680-
.items()
681-
.map(|(file, dir)| (file.as_str(), dir.as_ref().map(|y| y.as_str())));
682679
for (lock_file_name, directory_name) in
683-
lock_file_to_session_dir_iter.into_sorted_stable_ord(false)
680+
lock_file_to_session_dir.items().into_sorted_stable_ord()
684681
{
685682
if directory_name.is_none() {
686683
let Ok(timestamp) = extract_timestamp_from_session_dir(lock_file_name) else {
@@ -712,10 +709,10 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
712709
}
713710

714711
// Filter out `None` directories
715-
let lock_file_to_session_dir: UnordMap<String, String> =
716-
UnordMap::from(lock_file_to_session_dir.into_items().filter_map(
717-
|(lock_file_name, directory_name)| directory_name.map(|n| (lock_file_name, n)),
718-
));
712+
let lock_file_to_session_dir: UnordMap<String, String> = lock_file_to_session_dir
713+
.into_items()
714+
.filter_map(|(lock_file_name, directory_name)| directory_name.map(|n| (lock_file_name, n)))
715+
.into();
719716

720717
// Delete all session directories that don't have a lock file.
721718
for directory_name in session_directories {
@@ -821,7 +818,7 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
821818
}
822819
None
823820
});
824-
let deletion_candidates = UnordMap::from(deletion_candidates);
821+
let deletion_candidates = deletion_candidates.into();
825822

826823
// Delete all but the most recent of the candidates
827824
all_except_most_recent(deletion_candidates).into_items().all(|(path, lock)| {

‎compiler/rustc_incremental/src/persist/fs/tests.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@ use super::*;
22

33
#[test]
44
fn test_all_except_most_recent() {
5-
let computed: UnordMap<_, Option<flock::Lock>> = UnordMap::from_iter([
5+
let input: UnordMap<_, Option<flock::Lock>> = UnordMap::from_iter([
66
((UNIX_EPOCH + Duration::new(4, 0), PathBuf::from("4")), None),
77
((UNIX_EPOCH + Duration::new(1, 0), PathBuf::from("1")), None),
88
((UNIX_EPOCH + Duration::new(5, 0), PathBuf::from("5")), None),
99
((UNIX_EPOCH + Duration::new(3, 0), PathBuf::from("3")), None),
1010
((UNIX_EPOCH + Duration::new(2, 0), PathBuf::from("2")), None),
1111
]);
12-
let mut paths = UnordSet::default();
13-
paths.extend_unord(all_except_most_recent(computed).into_items().map(|(path, _)| path));
1412
assert_eq!(
15-
UnordSet::from(paths),
16-
UnordSet::from_iter([
17-
PathBuf::from("1"),
18-
PathBuf::from("2"),
19-
PathBuf::from("3"),
20-
PathBuf::from("4")
21-
])
13+
all_except_most_recent(input).into_items().map(|(path, _)| path).into_sorted_stable_ord(),
14+
vec![PathBuf::from("1"), PathBuf::from("2"), PathBuf::from("3"), PathBuf::from("4")]
2215
);
2316

2417
assert!(all_except_most_recent(UnordMap::default()).is_empty());

‎compiler/rustc_incremental/src/persist/work_product.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@ pub fn copy_cgu_workproduct_to_incr_comp_cache_dir(
4646

4747
/// Removes files for a given work product.
4848
pub fn delete_workproduct_files(sess: &Session, work_product: &WorkProduct) {
49-
for path in work_product
50-
.saved_files
51-
.items()
52-
.map(|(_, path)| path.as_str())
53-
.into_sorted_stable_ord(false)
54-
{
49+
for (_, path) in work_product.saved_files.items().into_sorted_stable_ord() {
5550
let path = in_incr_comp_dir_sess(sess, path);
5651
if let Err(err) = std_fs::remove_file(&path) {
5752
sess.emit_warning(errors::DeleteWorkProduct { path: &path, err });

‎compiler/rustc_interface/src/queries.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,15 @@ impl<'tcx> Queries<'tcx> {
194194
let future_opt = self.dep_graph_future()?.steal();
195195
let dep_graph = future_opt
196196
.and_then(|future| {
197-
let (prev_graph, prev_work_products) =
197+
let (prev_graph, mut prev_work_products) =
198198
sess.time("blocked_on_dep_graph_loading", || future.open().open(sess));
199-
let prev_work_products =
200-
FxIndexMap::from_iter(prev_work_products.into_sorted(&(), false));
199+
// Convert from UnordMap to FxIndexMap by sorting
200+
let prev_work_product_ids =
201+
prev_work_products.items().map(|x| *x.0).into_sorted_stable_ord();
202+
let prev_work_products = prev_work_product_ids
203+
.into_iter()
204+
.map(|x| (x, prev_work_products.remove(&x).unwrap()))
205+
.collect::<FxIndexMap<_, _>>();
201206
rustc_incremental::build_dep_graph(sess, prev_graph, prev_work_products)
202207
})
203208
.unwrap_or_else(DepGraph::new_disabled);

0 commit comments

Comments
 (0)