diff options
| author | bors <bors@rust-lang.org> | 2017-01-25 17:23:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-25 17:23:54 +0000 |
| commit | fc57e40ce703cb70a39249f5cfb661020a1549b6 (patch) | |
| tree | 60c257c4000f019544f94929faf63a2fcc48e56b /src/libcore | |
| parent | 1283c029557bcde106adde71f467fe133b3ffeff (diff) | |
| parent | a2fa75b70546baa160be2a00326fa1b08d699b4c (diff) | |
| download | rust-fc57e40ce703cb70a39249f5cfb661020a1549b6.tar.gz rust-fc57e40ce703cb70a39249f5cfb661020a1549b6.zip | |
Auto merge of #39296 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests - Successful merges: #38930, #39212, #39251, #39267, #39276, #39278 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/ops.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 94df72f28fa..9ff4725c9b3 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -2776,7 +2776,7 @@ impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *mut T {} #[unstable(feature = "coerce_unsized", issue = "27732")] impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *const T {} -/// Both `in (PLACE) EXPR` and `box EXPR` desugar into expressions +/// Both `PLACE <- EXPR` and `box EXPR` desugar into expressions /// that allocate an intermediate "place" that holds uninitialized /// state. The desugaring evaluates EXPR, and writes the result at /// the address returned by the `pointer` method of this trait. @@ -2791,7 +2791,7 @@ impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *const T {} /// converting the agent to an instance of the owning pointer, via the /// appropriate `finalize` method (see the `InPlace`. /// -/// If evaluating EXPR fails, then the destructor for the +/// If evaluating EXPR fails, then it is up to the destructor for the /// implementation of Place to clean up any intermediate state /// (e.g. deallocate box storage, pop a stack, etc). #[unstable(feature = "placement_new_protocol", issue = "27779")] @@ -2802,9 +2802,9 @@ pub trait Place<Data: ?Sized> { fn pointer(&mut self) -> *mut Data; } -/// Interface to implementations of `in (PLACE) EXPR`. +/// Interface to implementations of `PLACE <- EXPR`. /// -/// `in (PLACE) EXPR` effectively desugars into: +/// `PLACE <- EXPR` effectively desugars into: /// /// ```rust,ignore /// let p = PLACE; @@ -2817,7 +2817,7 @@ pub trait Place<Data: ?Sized> { /// } /// ``` /// -/// The type of `in (PLACE) EXPR` is derived from the type of `PLACE`; +/// The type of `PLACE <- EXPR` is derived from the type of `PLACE`; /// if the type of `PLACE` is `P`, then the final type of the whole /// expression is `P::Place::Owner` (see the `InPlace` and `Boxed` /// traits). @@ -2835,12 +2835,12 @@ pub trait Placer<Data: ?Sized> { fn make_place(self) -> Self::Place; } -/// Specialization of `Place` trait supporting `in (PLACE) EXPR`. +/// Specialization of `Place` trait supporting `PLACE <- EXPR`. #[unstable(feature = "placement_new_protocol", issue = "27779")] pub trait InPlace<Data: ?Sized>: Place<Data> { - /// `Owner` is the type of the end value of `in (PLACE) EXPR` + /// `Owner` is the type of the end value of `PLACE <- EXPR` /// - /// Note that when `in (PLACE) EXPR` is solely used for + /// Note that when `PLACE <- EXPR` is solely used for /// side-effecting an existing data-structure, /// e.g. `Vec::emplace_back`, then `Owner` need not carry any /// information at all (e.g. it can be the unit type `()` in that |
