Skip to content

Commit 4d9b37c

Browse files
committed
Auto merge of rust-lang#87118 - JohnTitor:rollup-8ltidsq, r=JohnTitor
Rollup of 6 pull requests Successful merges: - rust-lang#87085 (Search result colors) - rust-lang#87090 (Make BTreeSet::split_off name elements like other set methods do) - rust-lang#87098 (Unignore some pretty printing tests) - rust-lang#87099 (Upgrade `cc` crate to 1.0.69) - rust-lang#87101 (Suggest a path separator if a stray colon is found in a match arm) - rust-lang#87102 (Add GUI test for "go to first" feature) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a00023f + fd01b71 commit 4d9b37c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

alloc/src/collections/btree/set.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,8 @@ impl<T> BTreeSet<T> {
903903
self.map.append(&mut other.map);
904904
}
905905

906-
/// Splits the collection into two at the given key. Returns everything after the given key,
907-
/// including the key.
906+
/// Splits the collection into two at the given value. Returns everything after the given value,
907+
/// including the value.
908908
///
909909
/// # Examples
910910
///
@@ -933,11 +933,11 @@ impl<T> BTreeSet<T> {
933933
/// assert!(b.contains(&41));
934934
/// ```
935935
#[stable(feature = "btree_split_off", since = "1.11.0")]
936-
pub fn split_off<Q: ?Sized + Ord>(&mut self, key: &Q) -> Self
936+
pub fn split_off<Q: ?Sized + Ord>(&mut self, value: &Q) -> Self
937937
where
938938
T: Borrow<Q> + Ord,
939939
{
940-
BTreeSet { map: self.map.split_off(key) }
940+
BTreeSet { map: self.map.split_off(value) }
941941
}
942942

943943
/// Creates an iterator that visits all values in ascending order and uses a closure

profiler_builtins/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ core = { path = "../core" }
1414
compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
1515

1616
[build-dependencies]
17-
cc = "1.0.68"
17+
cc = "1.0.69"

unwind/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ compiler_builtins = "0.1.0"
2121
cfg-if = "0.1.8"
2222

2323
[build-dependencies]
24-
cc = "1.0.68"
24+
cc = "1.0.69"
2525

2626
[features]
2727

0 commit comments

Comments
 (0)