Skip to content

Commit 80e881f

Browse files
committed
fix build of alloc with no_global_oom_handling
1 parent f2d28fe commit 80e881f

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

library/alloc/src/boxed/convert.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use core::any::Any;
2+
#[cfg(not(no_global_oom_handling))]
23
use core::clone::TrivialClone;
34
use core::error::Error;
45
use core::mem;

library/alloc/src/rc.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@
244244
use core::any::Any;
245245
use core::cell::Cell;
246246
#[cfg(not(no_global_oom_handling))]
247-
use core::clone::CloneToUninit;
248-
use core::clone::TrivialClone;
247+
use core::clone::{CloneToUninit, TrivialClone};
249248
use core::cmp::Ordering;
250249
use core::hash::{Hash, Hasher};
251250
use core::intrinsics::abort;

library/alloc/src/slice.rs

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![cfg_attr(test, allow(unused_imports, dead_code))]
1414

1515
use core::borrow::{Borrow, BorrowMut};
16+
#[cfg(not(no_global_oom_handling))]
1617
use core::clone::TrivialClone;
1718
#[cfg(not(no_global_oom_handling))]
1819
use core::cmp::Ordering::{self, Less};
@@ -89,6 +90,7 @@ use crate::vec::Vec;
8990
#[allow(unreachable_pub)] // cfg(test) pub above
9091
pub(crate) mod hack {
9192
use core::alloc::Allocator;
93+
#[cfg(not(no_global_oom_handling))]
9294
use core::clone::TrivialClone;
9395

9496
use crate::boxed::Box;

library/alloc/src/sync.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use core::any::Any;
1212
#[cfg(not(no_global_oom_handling))]
1313
use core::clone::CloneToUninit;
14+
#[cfg(not(no_global_oom_handling))]
1415
use core::clone::TrivialClone;
1516
use core::cmp::Ordering;
1617
use core::hash::{Hash, Hasher};

library/alloc/src/vec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
5454
#![stable(feature = "rust1", since = "1.0.0")]
5555

56+
#[cfg(not(no_global_oom_handling))]
5657
use core::clone::TrivialClone;
5758
#[cfg(not(no_global_oom_handling))]
5859
use core::cmp;

0 commit comments

Comments
 (0)