Skip to content

Commit d10702b

Browse files
authored
Rollup merge of rust-lang#65336 - BO41:typo, r=petrochenkov
Fix typo in task::Waker fixes rust-lang#65323 in `libstd/error.rs` there are a few mentions of `trait@Send` and `trait@Sync`. Are they wrong as well?
2 parents f0f5e77 + 37018e0 commit d10702b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/libcore/task/wake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl fmt::Debug for Context<'_> {
217217
/// This handle encapsulates a [`RawWaker`] instance, which defines the
218218
/// executor-specific wakeup behavior.
219219
///
220-
/// Implements [`Clone`], [`trait@Send`], and [`trait@Sync`].
220+
/// Implements [`Clone`], [`Send`], and [`Sync`].
221221
///
222222
/// [`RawWaker`]: struct.RawWaker.html
223223
#[repr(transparent)]

src/libstd/error.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> {
269269

270270
#[stable(feature = "rust1", since = "1.0.0")]
271271
impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<dyn Error + Send + Sync + 'a> {
272-
/// Converts a type of [`Error`] + [`trait@Send`] + [`trait@Sync`] into a box of
273-
/// dyn [`Error`] + [`trait@Send`] + [`trait@Sync`].
272+
/// Converts a type of [`Error`] + [`Send`] + [`Sync`] into a box of
273+
/// dyn [`Error`] + [`Send`] + [`Sync`].
274274
///
275275
/// [`Error`]: ../error/trait.Error.html
276276
///
@@ -313,7 +313,7 @@ impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<dyn Error + Send + Sync +
313313

314314
#[stable(feature = "rust1", since = "1.0.0")]
315315
impl From<String> for Box<dyn Error + Send + Sync> {
316-
/// Converts a [`String`] into a box of dyn [`Error`] + [`trait@Send`] + [`trait@Sync`].
316+
/// Converts a [`String`] into a box of dyn [`Error`] + [`Send`] + [`Sync`].
317317
///
318318
/// [`Error`]: ../error/trait.Error.html
319319
///
@@ -377,7 +377,7 @@ impl From<String> for Box<dyn Error> {
377377

378378
#[stable(feature = "rust1", since = "1.0.0")]
379379
impl<'a> From<&str> for Box<dyn Error + Send + Sync + 'a> {
380-
/// Converts a [`str`] into a box of dyn [`Error`] + [`trait@Send`] + [`trait@Sync`].
380+
/// Converts a [`str`] into a box of dyn [`Error`] + [`Send`] + [`Sync`].
381381
///
382382
/// [`Error`]: ../error/trait.Error.html
383383
///
@@ -420,7 +420,7 @@ impl From<&str> for Box<dyn Error> {
420420

421421
#[stable(feature = "cow_box_error", since = "1.22.0")]
422422
impl<'a, 'b> From<Cow<'b, str>> for Box<dyn Error + Send + Sync + 'a> {
423-
/// Converts a [`Cow`] into a box of dyn [`Error`] + [`trait@Send`] + [`trait@Sync`].
423+
/// Converts a [`Cow`] into a box of dyn [`Error`] + [`Send`] + [`Sync`].
424424
///
425425
/// [`Cow`]: ../borrow/enum.Cow.html
426426
/// [`Error`]: ../error/trait.Error.html

0 commit comments

Comments
 (0)