Merge branch 'main' into eliza/dewarn

hawkw · Jul 28, 2022 · 15a2677 · 15a2677
2 parents 3a7a146 + 0a05f4a
commit 15a2677
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/maitake/src/task.rs b/maitake/src/task.rs
@@ -197,7 +197,7 @@ enum Cell<F: Future> {
 /// A virtual function pointer table (vtable) that specifies the behavior
 /// of a [`Task`] instance.
 ///
-/// This is distinct from the [`RawWakerVtable`] type in [`core::task`]: that
+/// This is distinct from the [`RawWakerVTable`] type in [`core::task`]: that
 /// type specifies the vtable for a task's [`Waker`], while this vtable
 /// specifies functions called by the runtime to poll, join, and deallocate a
 /// spawned task.

diff --git a/maitake/src/wait/cell.rs b/maitake/src/wait/cell.rs
@@ -65,7 +65,7 @@ struct State(usize);
 #[derive(Debug)]
 #[must_use = "futures do nothing unless `.await`ed or `poll`ed"]
 pub struct Wait<'a> {
-    /// The [`WaitQueue`] being waited on from.
+    /// The [`WaitCell`] being waited on.
     cell: &'a WaitCell,
 
     /// Whether we have already polled once

diff --git a/maitake/src/wait/queue.rs b/maitake/src/wait/queue.rs
@@ -198,7 +198,7 @@ pub struct WaitQueue {
 #[pin_project(PinnedDrop)]
 #[must_use = "futures do nothing unless `.await`ed or `poll`ed"]
 pub struct Wait<'a> {
-    /// The [`WaitQueue`] being waited on from.
+    /// The [`WaitQueue`] being waited on.
     queue: &'a WaitQueue,
 
     /// Entry in the wait queue linked list.

diff --git a/util/README.md b/util/README.md
@@ -30,7 +30,7 @@ in the [Mycelium] operating system and its related libraries.
 
 > **Warning**
 > This crate is not *really* intended for general public consumption &mdash;
-> it's written specifically for use in [`Mycelium`]. While it can be used
+> it's written specifically for use in [Mycelium]. While it can be used
 > elsewhere, it may have a number of Mycelium-specific quirks and design
 > decisions. It's being published to crates.io primarily so that other crates
 > which depend on it can be published, not because it's expected to be broadly