Skip to content

Commit 5e9f305

Browse files
committed
Auto merge of #29187 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #29158, #29162, #29175, #29176 - Failed merges:
2 parents 229385c + e058318 commit 5e9f305

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/doc/nomicon/dropck.md

+1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ checking the implicit assertion that no potentially expired data
220220
It is sometimes obvious that no such access can occur, like the case above.
221221
However, when dealing with a generic type parameter, such access can
222222
occur indirectly. Examples of such indirect access are:
223+
223224
* invoking a callback,
224225
* via a trait method call.
225226

src/doc/nomicon/leaking.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl<T> Rc<T> {
135135
fn new(data: T) -> Self {
136136
unsafe {
137137
// Wouldn't it be nice if heap::allocate worked like this?
138-
let ptr = heap::allocate<RcBox<T>>();
138+
let ptr = heap::allocate::<RcBox<T>>();
139139
ptr::write(ptr, RcBox {
140140
data: data,
141141
ref_count: 1,

src/libcore/ptr.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ impl<T> fmt::Pointer for Unique<T> {
538538
/// building abstractions like `Rc<T>` or `Arc<T>`, which internally
539539
/// use raw pointers to manage the memory that they own.
540540
#[unstable(feature = "shared", reason = "needs an RFC to flesh out design",
541-
issue = "0")]
541+
issue = "27730")]
542542
pub struct Shared<T: ?Sized> {
543543
pointer: NonZero<*const T>,
544544
// NOTE: this marker has no consequences for variance, but is necessary
@@ -551,37 +551,37 @@ pub struct Shared<T: ?Sized> {
551551

552552
/// `Shared` pointers are not `Send` because the data they reference may be aliased.
553553
// NB: This impl is unnecessary, but should provide better error messages.
554-
#[unstable(feature = "shared", issue = "0")]
554+
#[unstable(feature = "shared", issue = "27730")]
555555
impl<T: ?Sized> !Send for Shared<T> { }
556556

557557
/// `Shared` pointers are not `Sync` because the data they reference may be aliased.
558558
// NB: This impl is unnecessary, but should provide better error messages.
559-
#[unstable(feature = "shared", issue = "0")]
559+
#[unstable(feature = "shared", issue = "27730")]
560560
impl<T: ?Sized> !Sync for Shared<T> { }
561561

562-
#[unstable(feature = "shared", issue = "0")]
562+
#[unstable(feature = "shared", issue = "27730")]
563563
impl<T: ?Sized> Shared<T> {
564564
/// Creates a new `Shared`.
565565
pub unsafe fn new(ptr: *mut T) -> Self {
566566
Shared { pointer: NonZero::new(ptr), _marker: PhantomData }
567567
}
568568
}
569569

570-
#[unstable(feature = "shared", issue = "0")]
570+
#[unstable(feature = "shared", issue = "27730")]
571571
impl<T: ?Sized> Clone for Shared<T> {
572572
fn clone(&self) -> Self {
573573
*self
574574
}
575575
}
576576

577-
#[unstable(feature = "shared", issue = "0")]
577+
#[unstable(feature = "shared", issue = "27730")]
578578
impl<T: ?Sized> Copy for Shared<T> { }
579579

580580
#[cfg(not(stage0))] // remove cfg after new snapshot
581-
#[unstable(feature = "shared", issue = "0")]
581+
#[unstable(feature = "shared", issue = "27730")]
582582
impl<T: ?Sized, U: ?Sized> CoerceUnsized<Shared<U>> for Shared<T> where T: Unsize<U> { }
583583

584-
#[unstable(feature = "shared", issue = "0")]
584+
#[unstable(feature = "shared", issue = "27730")]
585585
impl<T: ?Sized> Deref for Shared<T> {
586586
type Target = *mut T;
587587

@@ -591,7 +591,7 @@ impl<T: ?Sized> Deref for Shared<T> {
591591
}
592592
}
593593

594-
#[unstable(feature = "shared", issue = "0")]
594+
#[unstable(feature = "shared", issue = "27730")]
595595
impl<T> fmt::Pointer for Shared<T> {
596596
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
597597
fmt::Pointer::fmt(&*self.pointer, f)

src/libstd/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ mod tests {
625625
drop(p.wait());
626626
}
627627

628-
#[cfg(unix)]
629628
#[cfg(all(unix, not(target_os="android")))]
629+
#[test]
630630
fn signal_reported_right() {
631631
use os::unix::process::ExitStatusExt;
632632

0 commit comments

Comments
 (0)