Skip to content

Commit 5f7b318

Browse files
committed
Auto merge of rust-lang#90037 - matthiaskrgr:rollup-cdfhxtn, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#89766 (RustWrapper: adapt for an LLVM API change) - rust-lang#89867 (Fix macro_rules! duplication when reexported in the same module) - rust-lang#89941 (removing TLS support in x86_64-unknown-none-hermitkernel) - rust-lang#89956 (Suggest a case insensitive match name regardless of levenshtein distance) - rust-lang#89988 (Do not promote values with const drop that need to be dropped) - rust-lang#89997 (Add test for issue rust-lang#84957 - `str.as_bytes()` in a `const` expression) - rust-lang#90002 (:arrow_up: rust-analyzer) - rust-lang#90034 (Tiny tweak to Iterator::unzip() doc comment example.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4c06719 + aad667e commit 5f7b318

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/src/iter/traits/iterator.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2837,12 +2837,12 @@ pub trait Iterator {
28372837
/// Basic usage:
28382838
///
28392839
/// ```
2840-
/// let a = [(1, 2), (3, 4)];
2840+
/// let a = [(1, 2), (3, 4), (5, 6)];
28412841
///
28422842
/// let (left, right): (Vec<_>, Vec<_>) = a.iter().cloned().unzip();
28432843
///
2844-
/// assert_eq!(left, [1, 3]);
2845-
/// assert_eq!(right, [2, 4]);
2844+
/// assert_eq!(left, [1, 3, 5]);
2845+
/// assert_eq!(right, [2, 4, 6]);
28462846
///
28472847
/// // you can also unzip multiple nested tuples at once
28482848
/// let a = [(1, (2, 3)), (4, (5, 6))];

std/src/sys/hermit/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl TcpStream {
182182
Ok(self.clone())
183183
}
184184

185-
pub fn set_linger(&self, linger: Option<Duration>) -> io::Result<()> {
185+
pub fn set_linger(&self, _linger: Option<Duration>) -> io::Result<()> {
186186
unsupported()
187187
}
188188

0 commit comments

Comments
 (0)