Skip to content

Commit 0f3a4c7

Browse files
authored
Rollup merge of #91746 - ssomers:btree_tests, r=Mark-Simulacrum
Btree: assert more API compatibility Introducing a member such as `BTreeSet::min()` would silently break compatibility if no code calls the existing `BTreeSet::min(set)`. `BTreeSet` is the only btree class silently bringing in stable members, apart from many occurrences of `#[derive(Debug)]` on iterators. r? `@Mark-Simulacrum`
2 parents e70e4d4 + cc35a11 commit 0f3a4c7

File tree

2 files changed

+38
-6
lines changed

2 files changed

+38
-6
lines changed

library/alloc/src/collections/btree/map/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ fn test_clone_from() {
15561556
}
15571557

15581558
#[allow(dead_code)]
1559-
fn test_variance() {
1559+
fn assert_covariance() {
15601560
fn map_key<'new>(v: BTreeMap<&'static str, ()>) -> BTreeMap<&'new str, ()> {
15611561
v
15621562
}
@@ -1615,7 +1615,7 @@ fn test_variance() {
16151615
}
16161616

16171617
#[allow(dead_code)]
1618-
fn test_sync() {
1618+
fn assert_sync() {
16191619
fn map<T: Sync>(v: &BTreeMap<T, T>) -> impl Sync + '_ {
16201620
v
16211621
}
@@ -1684,7 +1684,7 @@ fn test_sync() {
16841684
}
16851685

16861686
#[allow(dead_code)]
1687-
fn test_send() {
1687+
fn assert_send() {
16881688
fn map<T: Send>(v: BTreeMap<T, T>) -> impl Send {
16891689
v
16901690
}

library/alloc/src/collections/btree/set/tests.rs

+35-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use super::super::testing::rng::DeterministicRng;
33
use super::*;
44
use crate::vec::Vec;
55
use std::cmp::Ordering;
6+
use std::hash::{Hash, Hasher};
67
use std::iter::FromIterator;
78
use std::panic::{catch_unwind, AssertUnwindSafe};
89

@@ -513,7 +514,7 @@ fn test_recovery() {
513514
}
514515

515516
#[allow(dead_code)]
516-
fn test_variance() {
517+
fn assert_covariance() {
517518
fn set<'new>(v: BTreeSet<&'static str>) -> BTreeSet<&'new str> {
518519
v
519520
}
@@ -530,7 +531,7 @@ fn test_variance() {
530531
}
531532

532533
#[allow(dead_code)]
533-
fn test_sync() {
534+
fn assert_sync() {
534535
fn set<T: Sync>(v: &BTreeSet<T>) -> impl Sync + '_ {
535536
v
536537
}
@@ -569,7 +570,7 @@ fn test_sync() {
569570
}
570571

571572
#[allow(dead_code)]
572-
fn test_send() {
573+
fn assert_send() {
573574
fn set<T: Send>(v: BTreeSet<T>) -> impl Send {
574575
v
575576
}
@@ -607,6 +608,37 @@ fn test_send() {
607608
}
608609
}
609610

611+
#[allow(dead_code)]
612+
// Check that the member-like functions conditionally provided by #[derive()]
613+
// are not overriden by genuine member functions with a different signature.
614+
fn assert_derives() {
615+
fn hash<T: Hash, H: Hasher>(v: BTreeSet<T>, state: &mut H) {
616+
v.hash(state);
617+
// Tested much more thoroughly outside the crate in btree_set_hash.rs
618+
}
619+
fn eq<T: PartialEq>(v: BTreeSet<T>) {
620+
let _ = v.eq(&v);
621+
}
622+
fn ne<T: PartialEq>(v: BTreeSet<T>) {
623+
let _ = v.ne(&v);
624+
}
625+
fn cmp<T: Ord>(v: BTreeSet<T>) {
626+
let _ = v.cmp(&v);
627+
}
628+
fn min<T: Ord>(v: BTreeSet<T>, w: BTreeSet<T>) {
629+
let _ = v.min(w);
630+
}
631+
fn max<T: Ord>(v: BTreeSet<T>, w: BTreeSet<T>) {
632+
let _ = v.max(w);
633+
}
634+
fn clamp<T: Ord>(v: BTreeSet<T>, w: BTreeSet<T>, x: BTreeSet<T>) {
635+
let _ = v.clamp(w, x);
636+
}
637+
fn partial_cmp<T: PartialOrd>(v: &BTreeSet<T>) {
638+
let _ = v.partial_cmp(&v);
639+
}
640+
}
641+
610642
#[test]
611643
fn test_ord_absence() {
612644
fn set<K>(mut set: BTreeSet<K>) {

0 commit comments

Comments
 (0)