diff options
| author | bors <bors@rust-lang.org> | 2023-03-24 06:16:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-24 06:16:24 +0000 |
| commit | c763eceae349c1d827d9cfbf5df21ca40b21c861 (patch) | |
| tree | df8f56ba15d8be04f1ed1a37e30b8848b8b39b8f /library | |
| parent | 4c0f5008ce74563873cbd8574018dbe4906a5361 (diff) | |
| parent | 2cfcca629fe53f81ab312eeabb6d0efc5151a9bd (diff) | |
Auto merge of #109552 - matthiaskrgr:rollup-03xwois, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #109406 (Remove outdated comments) - #109433 (Return equal for two identical projections) - #109495 (Implement non-const `Destruct` trait in new solver) - #109519 (Link against libc++ on AIX) - #109550 (Make helper functions private in fn_ctxt/adjust_fulfillment_errors) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/alloc/src/collections/btree/mod.rs | 1 | ||||
| -rw-r--r-- | library/alloc/src/collections/btree/set.rs | 5 | ||||
| -rw-r--r-- | library/std/src/collections/hash/set.rs | 7 |
3 files changed, 0 insertions, 13 deletions
diff --git a/library/alloc/src/collections/btree/mod.rs b/library/alloc/src/collections/btree/mod.rs index 7552f2fc04c..c7d0144de30 100644 --- a/library/alloc/src/collections/btree/mod.rs +++ b/library/alloc/src/collections/btree/mod.rs @@ -13,7 +13,6 @@ pub mod set; mod set_val; mod split; -#[doc(hidden)] trait Recover<Q: ?Sized> { type Key; diff --git a/library/alloc/src/collections/btree/set.rs b/library/alloc/src/collections/btree/set.rs index 4ddb2119252..4de30d40825 100644 --- a/library/alloc/src/collections/btree/set.rs +++ b/library/alloc/src/collections/btree/set.rs @@ -1,6 +1,3 @@ -// This is pretty much entirely stolen from TreeSet, since BTreeMap has an identical interface -// to TreeMap - use crate::vec::Vec; use core::borrow::Borrow; use core::cmp::Ordering::{self, Equal, Greater, Less}; @@ -18,8 +15,6 @@ use super::Recover; use crate::alloc::{Allocator, Global}; -// FIXME(conventions): implement bounded iterators - /// An ordered set based on a B-Tree. /// /// See [`BTreeMap`]'s documentation for a detailed discussion of this collection's performance diff --git a/library/std/src/collections/hash/set.rs b/library/std/src/collections/hash/set.rs index b59f89d321c..837a18bff60 100644 --- a/library/std/src/collections/hash/set.rs +++ b/library/std/src/collections/hash/set.rs @@ -12,13 +12,6 @@ use crate::ops::{BitAnd, BitOr, BitXor, Sub}; use super::map::{map_try_reserve_error, RandomState}; -// Future Optimization (FIXME!) -// ============================ -// -// Iteration over zero sized values is a noop. There is no need -// for `bucket.val` in the case of HashSet. I suppose we would need HKT -// to get rid of it properly. - /// A [hash set] implemented as a `HashMap` where the value is `()`. /// /// As with the [`HashMap`] type, a `HashSet` requires that the elements |
