Skip to content

Commit

Permalink
Rollup merge of rust-lang#62788 - fakenine:normalize_use_of_backticks…
Browse files Browse the repository at this point in the history
…_compiler_messages_p9, r=Centril

normalize use of backticks in compiler messages for libcore/ptr

rust-lang#60532
  • Loading branch information
Centril authored Jul 22, 2019
2 parents 002f604 + 886fb21 commit 7dafdd2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/libcore/ptr/unique.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use crate::ptr::NonNull;
/// Unlike `*mut T`, `Unique<T>` is covariant over `T`. This should always be correct
/// for any type which upholds Unique's aliasing requirements.
#[unstable(feature = "ptr_internals", issue = "0",
reason = "use NonNull instead and consider PhantomData<T> \
(if you also use #[may_dangle]), Send, and/or Sync")]
reason = "use `NonNull` instead and consider `PhantomData<T>` \
(if you also use `#[may_dangle]`), `Send`, and/or `Sync`")]
#[doc(hidden)]
#[repr(transparent)]
#[rustc_layout_scalar_valid_range_start(1)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/feature-gate/issue-49983-see-issue-0.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0658]: use of unstable library feature 'ptr_internals': use NonNull instead and consider PhantomData<T> (if you also use #[may_dangle]), Send, and/or Sync
error[E0658]: use of unstable library feature 'ptr_internals': use `NonNull` instead and consider `PhantomData<T>` (if you also use `#[may_dangle]`), `Send`, and/or `Sync`
--> $DIR/issue-49983-see-issue-0.rs:4:30
|
LL | #[allow(unused_imports)] use core::ptr::Unique;
Expand Down

0 comments on commit 7dafdd2

Please sign in to comment.