nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pattern matching mode changes and unsafe_op_in_unsafe_fn

Browse Source
This commit is contained in:
Michael Goulet 2025-02-07 18:35:46 +00:00
parent a4e7f8f9bf
commit 4312d7b541
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/alloc/src/collections/btree/merge_iter.rs
View File

@ -74,7 +74,7 @@ impl<I: Iterator> MergeIterInner<I> {
b_next = self.b.next(); b_next = self.b.next();
} }
} }
if let (Some(ref a1), Some(ref b1)) = (&a_next, &b_next) { if let (Some(a1), Some(b1)) = (&a_next, &b_next) {
match cmp(a1, b1) { match cmp(a1, b1) {
Ordering::Less => self.peeked = b_next.take().map(Peeked::B), Ordering::Less => self.peeked = b_next.take().map(Peeked::B),
Ordering::Greater => self.peeked = a_next.take().map(Peeked::A), Ordering::Greater => self.peeked = a_next.take().map(Peeked::A),

6
library/std/src/sync/mpmc/mod.rs
View File

@ -616,9 +616,9 @@ impl<T> Sender<T> {
#[unstable(feature = "mpmc_channel", issue = "126840")] #[unstable(feature = "mpmc_channel", issue = "126840")]
pub fn same_channel(&self, other: &Sender<T>) -> bool { pub fn same_channel(&self, other: &Sender<T>) -> bool {
match (&self.flavor, &other.flavor) { match (&self.flavor, &other.flavor) {
(SenderFlavor::Array(ref a), SenderFlavor::Array(ref b)) => a == b, (SenderFlavor::Array(a), SenderFlavor::Array(b)) => a == b,
(SenderFlavor::List(ref a), SenderFlavor::List(ref b)) => a == b, (SenderFlavor::List(a), SenderFlavor::List(b)) => a == b,
(SenderFlavor::Zero(ref a), SenderFlavor::Zero(ref b)) => a == b, (SenderFlavor::Zero(a), SenderFlavor::Zero(b)) => a == b,
_ => false, _ => false,
} }
} }

8
library/test/src/lib.rs
View File

@ -184,12 +184,16 @@ pub fn test_main_static_abort(tests: &[&TestDescAndFn]) {
// If we're being run in SpawnedSecondary mode, run the test here. run_test // If we're being run in SpawnedSecondary mode, run the test here. run_test
// will then exit the process. // will then exit the process.
if let Ok(name) = env::var(SECONDARY_TEST_INVOKER_VAR) { if let Ok(name) = env::var(SECONDARY_TEST_INVOKER_VAR) {
env::remove_var(SECONDARY_TEST_INVOKER_VAR); unsafe {
env::remove_var(SECONDARY_TEST_INVOKER_VAR);
}
// Convert benchmarks to tests if we're not benchmarking. // Convert benchmarks to tests if we're not benchmarking.
let mut tests = tests.iter().map(make_owned_test).collect::<Vec<_>>(); let mut tests = tests.iter().map(make_owned_test).collect::<Vec<_>>();
if env::var(SECONDARY_TEST_BENCH_BENCHMARKS_VAR).is_ok() { if env::var(SECONDARY_TEST_BENCH_BENCHMARKS_VAR).is_ok() {
env::remove_var(SECONDARY_TEST_BENCH_BENCHMARKS_VAR); unsafe {
env::remove_var(SECONDARY_TEST_BENCH_BENCHMARKS_VAR);
}
} else { } else {
tests = convert_benchmarks_to_tests(tests); tests = convert_benchmarks_to_tests(tests);
}; };