Skip to content

Commit c644a7f

Browse files
committed
Adds partial_cmp.rs file and partial_cmp signature to mod.rs
1 parent c7f6543 commit c644a7f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/stream/stream/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ extension_trait! {
11861186
}
11871187

11881188
#[doc = r#"
1189+
<<<<<<< HEAD
11891190
Combines multiple streams into a single stream of all their outputs.
11901191
11911192
Items are yielded as soon as they're received, and the stream continues yield until both
@@ -1231,6 +1232,7 @@ extension_trait! {
12311232
#
12321233
use async_std::prelude::*;
12331234
use std::collections::VecDeque;
1235+
12341236
use std::cmp::Ordering;
12351237
let s1 = VecDeque::from(vec![1]);
12361238
let s2 = VecDeque::from(vec![1, 2]);

0 commit comments

Comments
 (0)