about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-04-14 19:38:08 +0000
committerbors <bors@rust-lang.org>2023-04-14 19:38:08 +0000
commit84dd17b56a931a631a23dfd5ef2018fd3ef49108 (patch)
tree54bf25e0b3e1f48be94752b14fadd46ed7dbed25 /src/bootstrap
parent276fa294809e914b1d04192392d256814aa5ce1a (diff)
parent0d97522ee751cf485f3daf621bcc0ff1e6771f0f (diff)
downloadrust-84dd17b56a931a631a23dfd5ef2018fd3ef49108.tar.gz
rust-84dd17b56a931a631a23dfd5ef2018fd3ef49108.zip
Auto merge of #110331 - matthiaskrgr:rollup-9vldvow, r=matthiaskrgr
Rollup of 7 pull requests

Successful merges:

 - #108687 (Reformulate `point_at_expr_source_of_inferred_type` to be more accurate)
 - #109272 (Add Command environment variable inheritance docs)
 - #109947 (Add links from `core::cmp` derives to their traits)
 - #110110 (Use `Display` in top-level example for `PanicInfo`)
 - #110154 (Fix typos in library)
 - #110244 (Remove some unneeded imports / qualified paths)
 - #110328 ([rustdoc] Add explanations for auto-disambiguation when an intra doc link is resolved to a proc-macro and a trait at the same time)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/cache.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs
index 05f25af68ea..5376c4ec9c3 100644
--- a/src/bootstrap/cache.rs
+++ b/src/bootstrap/cache.rs
@@ -1,9 +1,8 @@
 use std::any::{Any, TypeId};
 use std::borrow::Borrow;
 use std::cell::RefCell;
-use std::cmp::{Ord, Ordering, PartialOrd};
+use std::cmp::Ordering;
 use std::collections::HashMap;
-use std::convert::AsRef;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;