Skip to content

Commit 5c4c81a

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents 1bc188f + 374229a commit 5c4c81a

File tree

24 files changed

+768
-152
lines changed

24 files changed

+768
-152
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎alloc/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }
13-
compiler_builtins = { version = "0.1.121", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "0.1.123", features = ['rustc-dep-of-std'] }
1414

1515
[dev-dependencies]
1616
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

‎alloc/src/boxed.rs‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ impl<T> Box<T> {
262262
/// # Examples
263263
///
264264
/// ```
265-
/// #![feature(new_uninit)]
266-
///
267265
/// let mut five = Box::<u32>::new_uninit();
268266
///
269267
/// let five = unsafe {
@@ -276,7 +274,7 @@ impl<T> Box<T> {
276274
/// assert_eq!(*five, 5)
277275
/// ```
278276
#[cfg(not(no_global_oom_handling))]
279-
#[unstable(feature = "new_uninit", issue = "63291")]
277+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
280278
#[must_use]
281279
#[inline]
282280
pub fn new_uninit() -> Box<mem::MaybeUninit<T>> {
@@ -292,7 +290,6 @@ impl<T> Box<T> {
292290
/// # Examples
293291
///
294292
/// ```
295-
/// #![feature(new_uninit)]
296293
/// #![feature(new_zeroed_alloc)]
297294
///
298295
/// let zero = Box::<u32>::new_zeroed();
@@ -350,7 +347,7 @@ impl<T> Box<T> {
350347
/// # Examples
351348
///
352349
/// ```
353-
/// #![feature(allocator_api, new_uninit)]
350+
/// #![feature(allocator_api)]
354351
///
355352
/// let mut five = Box::<u32>::try_new_uninit()?;
356353
///
@@ -380,7 +377,7 @@ impl<T> Box<T> {
380377
/// # Examples
381378
///
382379
/// ```
383-
/// #![feature(allocator_api, new_uninit)]
380+
/// #![feature(allocator_api)]
384381
///
385382
/// let zero = Box::<u32>::try_new_zeroed()?;
386383
/// let zero = unsafe { zero.assume_init() };
@@ -460,7 +457,7 @@ impl<T, A: Allocator> Box<T, A> {
460457
/// # Examples
461458
///
462459
/// ```
463-
/// #![feature(allocator_api, new_uninit)]
460+
/// #![feature(allocator_api)]
464461
///
465462
/// use std::alloc::System;
466463
///
@@ -498,7 +495,7 @@ impl<T, A: Allocator> Box<T, A> {
498495
/// # Examples
499496
///
500497
/// ```
501-
/// #![feature(allocator_api, new_uninit)]
498+
/// #![feature(allocator_api)]
502499
///
503500
/// use std::alloc::System;
504501
///
@@ -538,7 +535,7 @@ impl<T, A: Allocator> Box<T, A> {
538535
/// # Examples
539536
///
540537
/// ```
541-
/// #![feature(allocator_api, new_uninit)]
538+
/// #![feature(allocator_api)]
542539
///
543540
/// use std::alloc::System;
544541
///
@@ -576,7 +573,7 @@ impl<T, A: Allocator> Box<T, A> {
576573
/// # Examples
577574
///
578575
/// ```
579-
/// #![feature(allocator_api, new_uninit)]
576+
/// #![feature(allocator_api)]
580577
///
581578
/// use std::alloc::System;
582579
///
@@ -654,8 +651,6 @@ impl<T> Box<[T]> {
654651
/// # Examples
655652
///
656653
/// ```
657-
/// #![feature(new_uninit)]
658-
///
659654
/// let mut values = Box::<[u32]>::new_uninit_slice(3);
660655
///
661656
/// let values = unsafe {
@@ -670,7 +665,7 @@ impl<T> Box<[T]> {
670665
/// assert_eq!(*values, [1, 2, 3])
671666
/// ```
672667
#[cfg(not(no_global_oom_handling))]
673-
#[unstable(feature = "new_uninit", issue = "63291")]
668+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
674669
#[must_use]
675670
pub fn new_uninit_slice(len: usize) -> Box<[mem::MaybeUninit<T>]> {
676671
unsafe { RawVec::with_capacity(len).into_box(len) }
@@ -686,7 +681,6 @@ impl<T> Box<[T]> {
686681
///
687682
/// ```
688683
/// #![feature(new_zeroed_alloc)]
689-
/// #![feature(new_uninit)]
690684
///
691685
/// let values = Box::<[u32]>::new_zeroed_slice(3);
692686
/// let values = unsafe { values.assume_init() };
@@ -708,7 +702,7 @@ impl<T> Box<[T]> {
708702
/// # Examples
709703
///
710704
/// ```
711-
/// #![feature(allocator_api, new_uninit)]
705+
/// #![feature(allocator_api)]
712706
///
713707
/// let mut values = Box::<[u32]>::try_new_uninit_slice(3)?;
714708
/// let values = unsafe {
@@ -746,7 +740,7 @@ impl<T> Box<[T]> {
746740
/// # Examples
747741
///
748742
/// ```
749-
/// #![feature(allocator_api, new_uninit)]
743+
/// #![feature(allocator_api)]
750744
///
751745
/// let values = Box::<[u32]>::try_new_zeroed_slice(3)?;
752746
/// let values = unsafe { values.assume_init() };
@@ -778,7 +772,7 @@ impl<T, A: Allocator> Box<[T], A> {
778772
/// # Examples
779773
///
780774
/// ```
781-
/// #![feature(allocator_api, new_uninit)]
775+
/// #![feature(allocator_api)]
782776
///
783777
/// use std::alloc::System;
784778
///
@@ -812,7 +806,7 @@ impl<T, A: Allocator> Box<[T], A> {
812806
/// # Examples
813807
///
814808
/// ```
815-
/// #![feature(allocator_api, new_uninit)]
809+
/// #![feature(allocator_api)]
816810
///
817811
/// use std::alloc::System;
818812
///
@@ -837,7 +831,7 @@ impl<T, A: Allocator> Box<[T], A> {
837831
/// # Examples
838832
///
839833
/// ```
840-
/// #![feature(allocator_api, new_uninit)]
834+
/// #![feature(allocator_api)]
841835
///
842836
/// use std::alloc::System;
843837
///
@@ -880,7 +874,7 @@ impl<T, A: Allocator> Box<[T], A> {
880874
/// # Examples
881875
///
882876
/// ```
883-
/// #![feature(allocator_api, new_uninit)]
877+
/// #![feature(allocator_api)]
884878
///
885879
/// use std::alloc::System;
886880
///
@@ -927,8 +921,6 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
927921
/// # Examples
928922
///
929923
/// ```
930-
/// #![feature(new_uninit)]
931-
///
932924
/// let mut five = Box::<u32>::new_uninit();
933925
///
934926
/// let five: Box<u32> = unsafe {
@@ -940,7 +932,7 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
940932
///
941933
/// assert_eq!(*five, 5)
942934
/// ```
943-
#[unstable(feature = "new_uninit", issue = "63291")]
935+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
944936
#[inline]
945937
pub unsafe fn assume_init(self) -> Box<T, A> {
946938
let (raw, alloc) = Box::into_raw_with_allocator(self);
@@ -958,7 +950,6 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
958950
///
959951
/// ```
960952
/// #![feature(box_uninit_write)]
961-
/// #![feature(new_uninit)]
962953
///
963954
/// let big_box = Box::<[usize; 1024]>::new_uninit();
964955
///
@@ -1001,8 +992,6 @@ impl<T, A: Allocator> Box<[mem::MaybeUninit<T>], A> {
1001992
/// # Examples
1002993
///
1003994
/// ```
1004-
/// #![feature(new_uninit)]
1005-
///
1006995
/// let mut values = Box::<[u32]>::new_uninit_slice(3);
1007996
///
1008997
/// let values = unsafe {
@@ -1016,7 +1005,7 @@ impl<T, A: Allocator> Box<[mem::MaybeUninit<T>], A> {
10161005
///
10171006
/// assert_eq!(*values, [1, 2, 3])
10181007
/// ```
1019-
#[unstable(feature = "new_uninit", issue = "63291")]
1008+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
10201009
#[inline]
10211010
pub unsafe fn assume_init(self) -> Box<[T], A> {
10221011
let (raw, alloc) = Box::into_raw_with_allocator(self);

‎alloc/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
// tidy-alphabetical-start
9494
#![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))]
9595
#![cfg_attr(not(no_global_oom_handling), feature(const_btree_len))]
96-
#![cfg_attr(test, feature(new_uninit))]
9796
#![feature(alloc_layout_extra)]
9897
#![feature(allocator_api)]
9998
#![feature(array_chunks)]

‎alloc/src/rc.rs‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ impl<T> Rc<T> {
503503
/// # Examples
504504
///
505505
/// ```
506-
/// #![feature(new_uninit)]
507506
/// #![feature(get_mut_unchecked)]
508507
///
509508
/// use std::rc::Rc;
@@ -518,7 +517,7 @@ impl<T> Rc<T> {
518517
/// assert_eq!(*five, 5)
519518
/// ```
520519
#[cfg(not(no_global_oom_handling))]
521-
#[unstable(feature = "new_uninit", issue = "63291")]
520+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
522521
#[must_use]
523522
pub fn new_uninit() -> Rc<mem::MaybeUninit<T>> {
524523
unsafe {
@@ -540,7 +539,6 @@ impl<T> Rc<T> {
540539
///
541540
/// ```
542541
/// #![feature(new_zeroed_alloc)]
543-
/// #![feature(new_uninit)]
544542
///
545543
/// use std::rc::Rc;
546544
///
@@ -594,7 +592,7 @@ impl<T> Rc<T> {
594592
/// # Examples
595593
///
596594
/// ```
597-
/// #![feature(allocator_api, new_uninit)]
595+
/// #![feature(allocator_api)]
598596
/// #![feature(get_mut_unchecked)]
599597
///
600598
/// use std::rc::Rc;
@@ -630,7 +628,7 @@ impl<T> Rc<T> {
630628
/// # Examples
631629
///
632630
/// ```
633-
/// #![feature(allocator_api, new_uninit)]
631+
/// #![feature(allocator_api)]
634632
///
635633
/// use std::rc::Rc;
636634
///
@@ -692,7 +690,6 @@ impl<T, A: Allocator> Rc<T, A> {
692690
/// # Examples
693691
///
694692
/// ```
695-
/// #![feature(new_uninit)]
696693
/// #![feature(get_mut_unchecked)]
697694
/// #![feature(allocator_api)]
698695
///
@@ -736,7 +733,6 @@ impl<T, A: Allocator> Rc<T, A> {
736733
/// # Examples
737734
///
738735
/// ```
739-
/// #![feature(new_uninit)]
740736
/// #![feature(allocator_api)]
741737
///
742738
/// use std::rc::Rc;
@@ -799,7 +795,7 @@ impl<T, A: Allocator> Rc<T, A> {
799795
/// # Examples
800796
///
801797
/// ```
802-
/// #![feature(allocator_api, new_uninit)]
798+
/// #![feature(allocator_api)]
803799
/// #![feature(get_mut_unchecked)]
804800
///
805801
/// use std::rc::Rc;
@@ -843,7 +839,7 @@ impl<T, A: Allocator> Rc<T, A> {
843839
/// # Examples
844840
///
845841
/// ```
846-
/// #![feature(allocator_api, new_uninit)]
842+
/// #![feature(allocator_api)]
847843
///
848844
/// use std::rc::Rc;
849845
/// use std::alloc::System;
@@ -967,7 +963,6 @@ impl<T> Rc<[T]> {
967963
/// # Examples
968964
///
969965
/// ```
970-
/// #![feature(new_uninit)]
971966
/// #![feature(get_mut_unchecked)]
972967
///
973968
/// use std::rc::Rc;
@@ -985,7 +980,7 @@ impl<T> Rc<[T]> {
985980
/// assert_eq!(*values, [1, 2, 3])
986981
/// ```
987982
#[cfg(not(no_global_oom_handling))]
988-
#[unstable(feature = "new_uninit", issue = "63291")]
983+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
989984
#[must_use]
990985
pub fn new_uninit_slice(len: usize) -> Rc<[mem::MaybeUninit<T>]> {
991986
unsafe { Rc::from_ptr(Rc::allocate_for_slice(len)) }
@@ -1000,7 +995,6 @@ impl<T> Rc<[T]> {
1000995
/// # Examples
1001996
///
1002997
/// ```
1003-
/// #![feature(new_uninit)]
1004998
/// #![feature(new_zeroed_alloc)]
1005999
///
10061000
/// use std::rc::Rc;
@@ -1035,7 +1029,6 @@ impl<T, A: Allocator> Rc<[T], A> {
10351029
/// # Examples
10361030
///
10371031
/// ```
1038-
/// #![feature(new_uninit)]
10391032
/// #![feature(get_mut_unchecked)]
10401033
/// #![feature(allocator_api)]
10411034
///
@@ -1072,7 +1065,6 @@ impl<T, A: Allocator> Rc<[T], A> {
10721065
/// # Examples
10731066
///
10741067
/// ```
1075-
/// #![feature(new_uninit)]
10761068
/// #![feature(allocator_api)]
10771069
///
10781070
/// use std::rc::Rc;
@@ -1122,7 +1114,6 @@ impl<T, A: Allocator> Rc<mem::MaybeUninit<T>, A> {
11221114
/// # Examples
11231115
///
11241116
/// ```
1125-
/// #![feature(new_uninit)]
11261117
/// #![feature(get_mut_unchecked)]
11271118
///
11281119
/// use std::rc::Rc;
@@ -1136,7 +1127,7 @@ impl<T, A: Allocator> Rc<mem::MaybeUninit<T>, A> {
11361127
///
11371128
/// assert_eq!(*five, 5)
11381129
/// ```
1139-
#[unstable(feature = "new_uninit", issue = "63291")]
1130+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
11401131
#[inline]
11411132
pub unsafe fn assume_init(self) -> Rc<T, A> {
11421133
let (ptr, alloc) = Rc::into_inner_with_allocator(self);
@@ -1160,7 +1151,6 @@ impl<T, A: Allocator> Rc<[mem::MaybeUninit<T>], A> {
11601151
/// # Examples
11611152
///
11621153
/// ```
1163-
/// #![feature(new_uninit)]
11641154
/// #![feature(get_mut_unchecked)]
11651155
///
11661156
/// use std::rc::Rc;
@@ -1177,7 +1167,7 @@ impl<T, A: Allocator> Rc<[mem::MaybeUninit<T>], A> {
11771167
///
11781168
/// assert_eq!(*values, [1, 2, 3])
11791169
/// ```
1180-
#[unstable(feature = "new_uninit", issue = "63291")]
1170+
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
11811171
#[inline]
11821172
pub unsafe fn assume_init(self) -> Rc<[T], A> {
11831173
let (ptr, alloc) = Rc::into_inner_with_allocator(self);

0 commit comments

Comments
 (0)