Skip to content

Commit 9081929

Browse files
committedNov 29, 2019
Auto merge of #66879 - RalfJung:rollup-nprxpzi, r=RalfJung
Rollup of 11 pull requests Successful merges: - #66379 (Rephrase docs in for ptr) - #66589 (Draw vertical lines correctly in compiler error messages) - #66613 (Allow customising ty::TraitRef's printing behavior) - #66766 (Panic machinery comments and tweaks) - #66791 (Handle GlobalCtxt directly from librustc_interface query system) - #66793 (Record temporary static references in generator witnesses) - #66808 (Cleanup error code) - #66826 (Clarifies how to tag users for assigning PRs) - #66837 (Clarify `{f32,f64}::EPSILON` docs) - #66844 (Miri: do not consider memory allocated by caller_location leaked) - #66872 (Minor documentation fix) Failed merges: r? @ghost
2 parents 25d8a94 + 0b1b36c commit 9081929

File tree

50 files changed

+622
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+622
-379
lines changed
 

‎CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ All pull requests are reviewed by another person. We have a bot,
150150
request.
151151

152152
If you want to request that a specific person reviews your pull request,
153-
you can add an `r?` to the message. For example, [Steve][steveklabnik] usually reviews
153+
you can add an `r?` to the pull request description. For example, [Steve][steveklabnik] usually reviews
154154
documentation changes. So if you were to make a documentation change, add
155155

156156
r? @steveklabnik
157157

158-
to the end of the message, and @rust-highfive will assign [@steveklabnik][steveklabnik] instead
159-
of a random person. This is entirely optional.
158+
to the end of the pull request description, and [@rust-highfive][rust-highfive] will assign
159+
[@steveklabnik][steveklabnik] instead of a random person. This is entirely optional.
160160

161161
After someone has reviewed your pull request, they will leave an annotation
162162
on the pull request with an `r+`. It will look something like this:

‎src/libcore/any.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use crate::intrinsics;
6868
// Any trait
6969
///////////////////////////////////////////////////////////////////////////////
7070

71-
/// A type to emulate dynamic typing.
71+
/// A trait to emulate dynamic typing.
7272
///
7373
/// Most types implement `Any`. However, any type which contains a non-`'static` reference does not.
7474
/// See the [module-level documentation][mod] for more details.

0 commit comments

Comments
 (0)