Skip to content

Commit f5f638c

Browse files
ndrewxiendrewxie
committed
Fixed to_sorted => to_sorted_stable_ord
1 parent 6f2d3de commit f5f638c

File tree

6 files changed

+60
-37
lines changed

6 files changed

+60
-37
lines changed

‎compiler/rustc_data_structures/src/stable_hasher.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ impl<T1: HashStable<CTX>, T2: HashStable<CTX>, CTX> HashStable<CTX> for (T1, T2)
339339
}
340340
}
341341

342+
unsafe impl<T1: StableOrd, T2: StableOrd> StableOrd for (T1, T2) {}
343+
342344
impl<T1, T2, T3, CTX> HashStable<CTX> for (T1, T2, T3)
343345
where
344346
T1: HashStable<CTX>,
@@ -353,6 +355,8 @@ where
353355
}
354356
}
355357

358+
unsafe impl<T1: StableOrd, T2: StableOrd, T3: StableOrd> StableOrd for (T1, T2, T3) {}
359+
356360
impl<T1, T2, T3, T4, CTX> HashStable<CTX> for (T1, T2, T3, T4)
357361
where
358362
T1: HashStable<CTX>,
@@ -369,6 +373,11 @@ where
369373
}
370374
}
371375

376+
unsafe impl<T1: StableOrd, T2: StableOrd, T3: StableOrd, T4: StableOrd> StableOrd
377+
for (T1, T2, T3, T4)
378+
{
379+
}
380+
372381
impl<T: HashStable<CTX>, CTX> HashStable<CTX> for [T] {
373382
default fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
374383
self.len().hash_stable(ctx, hasher);
@@ -459,6 +468,8 @@ impl<CTX> HashStable<CTX> for str {
459468
}
460469
}
461470

471+
unsafe impl StableOrd for &str {}
472+
462473
impl<CTX> HashStable<CTX> for String {
463474
#[inline]
464475
fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {

‎compiler/rustc_incremental/src/assert_module_sources.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ impl<'tcx> AssertModuleSource<'tcx> {
118118
debug!("mapping '{}' to cgu name '{}'", self.field(attr, sym::module), cgu_name);
119119

120120
if !self.available_cgus.contains(&cgu_name) {
121-
let cgu_names: Vec<String> =
122-
self.available_cgus.items().map(|cgu| cgu.as_str().to_owned()).into_sorted(&());
121+
let cgu_names: Vec<&str> =
122+
self.available_cgus.items().map(|cgu| cgu.as_str()).into_sorted_stable_ord(true);
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: 9 additions & 7 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.to_sorted(&(), false) {
201+
for e in except.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
202202
if !auto.remove(e) {
203203
self.tcx.sess.emit_fatal(errors::AssertionAuto { span: attr.span, name, e });
204204
}
@@ -377,18 +377,20 @@ impl<'tcx> DirtyCleanVisitor<'tcx> {
377377
continue;
378378
};
379379
self.checked_attrs.insert(attr.id);
380-
assertion.clean.to_sorted(&(), false).iter().for_each(|label| {
380+
for label in assertion.clean.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
381381
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
382382
self.assert_clean(item_span, dep_node);
383-
});
384-
assertion.dirty.to_sorted(&(), false).iter().for_each(|label| {
383+
}
384+
for label in assertion.dirty.items().map(|x| x.as_str()).into_sorted_stable_ord(false) {
385385
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
386386
self.assert_dirty(item_span, dep_node);
387-
});
388-
assertion.loaded_from_disk.to_sorted(&(), false).iter().for_each(|label| {
387+
}
388+
for label in
389+
assertion.loaded_from_disk.items().map(|x| x.as_str()).into_sorted_stable_ord(false)
390+
{
389391
let dep_node = DepNode::from_label_string(self.tcx, &label, def_path_hash).unwrap();
390392
self.assert_loaded_from_disk(item_span, dep_node);
391-
});
393+
}
392394
}
393395
}
394396
}

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

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -661,50 +661,55 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
661661
session_directories.sort();
662662

663663
// Now map from lock files to session directories
664-
let lock_file_to_session_dir: UnordMap<String, Option<String>> =
665-
UnordMap::from(lock_files.into_items().map(|lock_file_name| {
664+
let lock_file_to_session_dir: UnordMap<String, Option<String>> = lock_files
665+
.into_items()
666+
.map(|lock_file_name| {
666667
assert!(lock_file_name.ends_with(LOCK_FILE_EXT));
667668
let dir_prefix_end = lock_file_name.len() - LOCK_FILE_EXT.len();
668669
let session_dir = {
669670
let dir_prefix = &lock_file_name[0..dir_prefix_end];
670671
session_directories.iter().find(|dir_name| dir_name.starts_with(dir_prefix))
671672
};
672673
(lock_file_name, session_dir.map(String::clone))
673-
}));
674+
})
675+
.into();
674676

675677
// Delete all lock files, that don't have an associated directory. They must
676678
// be some kind of leftover
677-
lock_file_to_session_dir.to_sorted(&(), false).iter().for_each(
678-
|(lock_file_name, directory_name)| {
679-
if directory_name.is_none() {
680-
let Ok(timestamp) = extract_timestamp_from_session_dir(lock_file_name) else {
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())));
682+
for (lock_file_name, directory_name) in
683+
lock_file_to_session_dir_iter.into_sorted_stable_ord(false)
684+
{
685+
if directory_name.is_none() {
686+
let Ok(timestamp) = extract_timestamp_from_session_dir(lock_file_name) else {
681687
debug!(
682688
"found lock-file with malformed timestamp: {}",
683689
crate_directory.join(&lock_file_name).display()
684690
);
685691
// Ignore it
686-
return;
692+
continue;
687693
};
688694

689-
let lock_file_path = crate_directory.join(&**lock_file_name);
695+
let lock_file_path = crate_directory.join(&*lock_file_name);
690696

691-
if is_old_enough_to_be_collected(timestamp) {
692-
debug!(
693-
"garbage_collect_session_directories() - deleting \
694-
garbage lock file: {}",
695-
lock_file_path.display()
696-
);
697-
delete_session_dir_lock_file(sess, &lock_file_path);
698-
} else {
699-
debug!(
700-
"garbage_collect_session_directories() - lock file with \
701-
no session dir not old enough to be collected: {}",
702-
lock_file_path.display()
703-
);
704-
}
697+
if is_old_enough_to_be_collected(timestamp) {
698+
debug!(
699+
"garbage_collect_session_directories() - deleting \
700+
garbage lock file: {}",
701+
lock_file_path.display()
702+
);
703+
delete_session_dir_lock_file(sess, &lock_file_path);
704+
} else {
705+
debug!(
706+
"garbage_collect_session_directories() - lock file with \
707+
no session dir not old enough to be collected: {}",
708+
lock_file_path.display()
709+
);
705710
}
706-
},
707-
);
711+
}
712+
}
708713

709714
// Filter out `None` directories
710715
let lock_file_to_session_dir: UnordMap<String, String> =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pub fn load_dep_graph(sess: &Session) -> DepGraphFuture {
147147
let report_incremental_info = sess.opts.unstable_opts.incremental_info;
148148
let expected_hash = sess.opts.dep_tracking_hash(false);
149149

150-
let mut prev_work_products = FxIndexMap::default();
150+
let mut prev_work_products = UnordMap::default();
151151

152152
// If we are only building with -Zquery-dep-graph but without an actual
153153
// incr. comp. session directory, we skip this. Otherwise we'd fail

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ 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-
work_product.saved_files.to_sorted(&(), false).iter().for_each(|(_, path)| {
49+
for path in work_product
50+
.saved_files
51+
.items()
52+
.map(|(_, path)| path.as_str())
53+
.into_sorted_stable_ord(false)
54+
{
5055
let path = in_incr_comp_dir_sess(sess, path);
5156
if let Err(err) = std_fs::remove_file(&path) {
5257
sess.emit_warning(errors::DeleteWorkProduct { path: &path, err });
5358
}
54-
});
59+
}
5560
}

0 commit comments

Comments
 (0)