about summary refs log tree commit diff
path: root/library/core/src/array
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-03-26 02:07:49 +0000
committerbors <bors@rust-lang.org>2024-03-26 02:07:49 +0000
commit8b9e47c136aeee998effdcae356e134b8de65891 (patch)
tree56684502a9f401734b1b02da80ca4b4930207f1d /library/core/src/array
parentc98ea0d8085473c2947eb7fd0d1a1be9f1626251 (diff)
parent56e8f67c87690feb93a8ddec3625f420d1695873 (diff)
downloadrust-8b9e47c136aeee998effdcae356e134b8de65891.tar.gz
rust-8b9e47c136aeee998effdcae356e134b8de65891.zip
Auto merge of #123065 - workingjubilee:rollup-bve45ex, r=workingjubilee
Rollup of 10 pull requests

Successful merges:

 - #122707 (Fix a typo in the alloc::string::String docs)
 - #122769 (extend comments for reachability set computation)
 - #122892 (fix(bootstrap/dist): use versioned dirs when vendoring)
 - #122896 (Update stdarch submodule)
 - #122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.)
 - #122950 (Add regression tests for #101903)
 - #123039 (Update books)
 - #123042 (Import the 2021 prelude in the core crate)
 - #123044 (`Instance` is `Copy`)
 - #123051 (did I mention that tests are super cool? )

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/array')
-rw-r--r--library/core/src/array/equality.rs1
-rw-r--r--library/core/src/array/mod.rs2
2 files changed, 1 insertions, 2 deletions
diff --git a/library/core/src/array/equality.rs b/library/core/src/array/equality.rs
index bdb6599abf5..bb668d2a673 100644
--- a/library/core/src/array/equality.rs
+++ b/library/core/src/array/equality.rs
@@ -1,5 +1,4 @@
 use crate::cmp::BytewiseEq;
-use crate::convert::TryInto;
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T, U, const N: usize> PartialEq<[U; N]> for [T; N]
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
index 8b5b48c59c2..2a447aafe72 100644
--- a/library/core/src/array/mod.rs
+++ b/library/core/src/array/mod.rs
@@ -6,7 +6,7 @@
 
 use crate::borrow::{Borrow, BorrowMut};
 use crate::cmp::Ordering;
-use crate::convert::{Infallible, TryFrom};
+use crate::convert::Infallible;
 use crate::error::Error;
 use crate::fmt;
 use crate::hash::{self, Hash};