Rollup merge of #94128 - mqy:master, r=Dylan-DPC

rustdoc: several minor fixes

``@rustbot`` label A-docs
This commit is contained in:
Matthias Krüger 2022-02-23 12:26:40 +01:00 committed by GitHub
commit 0c676a8a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View File

@ -285,7 +285,7 @@ impl ParenthesizedArgs {
pub use crate::node_id::{NodeId, CRATE_NODE_ID, DUMMY_NODE_ID}; pub use crate::node_id::{NodeId, CRATE_NODE_ID, DUMMY_NODE_ID};
/// A modifier on a bound, e.g., `?Sized` or `~const Trait`. /// A modifier on a bound, e.g., `?Trait` or `~const Trait`.
/// ///
/// Negative bounds should also be handled here. /// Negative bounds should also be handled here.
#[derive(Copy, Clone, PartialEq, Eq, Encodable, Decodable, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Encodable, Decodable, Debug)]

View File

@ -47,7 +47,7 @@ pub enum GeneratorState<Y, R> {
/// fn main() { /// fn main() {
/// let mut generator = || { /// let mut generator = || {
/// yield 1; /// yield 1;
/// return "foo" /// "foo"
/// }; /// };
/// ///
/// match Pin::new(&mut generator).resume(()) { /// match Pin::new(&mut generator).resume(()) {

View File

@ -1100,8 +1100,8 @@ pub macro pin($value:expr $(,)?) {
// that would break `Pin`'s invariants. // that would break `Pin`'s invariants.
// - `{ $value }` is braced, making it a _block expression_, thus **moving** // - `{ $value }` is braced, making it a _block expression_, thus **moving**
// the given `$value`, and making it _become an **anonymous** temporary_. // the given `$value`, and making it _become an **anonymous** temporary_.
// By virtue of being anonynomous, it can no longer be accessed, thus // By virtue of being anonymous, it can no longer be accessed, thus
// preventing any attemps to `mem::replace` it or `mem::forget` it, _etc._ // preventing any attempts to `mem::replace` it or `mem::forget` it, _etc._
// //
// This gives us a `pin!` definition that is sound, and which works, but only // This gives us a `pin!` definition that is sound, and which works, but only
// in certain scenarios: // in certain scenarios:

View File

@ -8,7 +8,7 @@
//! In Rust with `-Z gcc-ld=lld` we have gcc or clang invoke rust-lld. Since there is no way to //! In Rust with `-Z gcc-ld=lld` we have gcc or clang invoke rust-lld. Since there is no way to
//! make gcc/clang pass `-flavor <flavor>` as the first two arguments in the linker invocation //! make gcc/clang pass `-flavor <flavor>` as the first two arguments in the linker invocation
//! and since Windows does not support symbolic links for files this wrapper is used in place of a //! and since Windows does not support symbolic links for files this wrapper is used in place of a
//! symblic link. It execs `../rust-lld -flavor ld` if the feature `ld` is enabled and //! symbolic link. It execs `../rust-lld -flavor ld` if the feature `ld` is enabled and
//! `../rust-lld -flavor ld64` if `ld64` is enabled. On Windows it spawns a `..\rust-lld.exe` //! `../rust-lld -flavor ld64` if `ld64` is enabled. On Windows it spawns a `..\rust-lld.exe`
//! child process. //! child process.