Skip to content

Commit 24b3688

Browse files
committed
Rollup merge of rust-lang#55901 - euclio:speling, r=petrochenkov
fix various typos in doc comments
2 parents 3d48823 + 4e35cbb commit 24b3688

File tree

48 files changed

+67
-67
lines changed

Some content is hidden

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

48 files changed

+67
-67
lines changed

src/liballoc/collections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct LeafNode<K, V> {
6969

7070
/// This node's index into the parent node's `edges` array.
7171
/// `*node.parent.edges[node.parent_idx]` should be the same thing as `node`.
72-
/// This is only guaranteed to be initialized when `parent` is nonnull.
72+
/// This is only guaranteed to be initialized when `parent` is non-null.
7373
parent_idx: MaybeUninit<u16>,
7474

7575
/// The number of keys and values this node stores.

src/liballoc/raw_vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ use boxed::Box;
4444
/// This enables you to use capacity growing logic catch the overflows in your length
4545
/// that might occur with zero-sized types.
4646
///
47-
/// However this means that you need to be careful when roundtripping this type
47+
/// However this means that you need to be careful when round-tripping this type
4848
/// with a `Box<[T]>`: `cap()` won't yield the len. However `with_capacity`,
4949
/// `shrink_to_fit`, and `from_box` will actually set RawVec's private capacity
5050
/// field. This allows zero-sized types to not be special-cased by consumers of

src/libcore/num/f32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ impl f32 {
445445
/// signaling NaNs on MIPS are quiet NaNs on x86, and vice-versa.
446446
///
447447
/// Rather than trying to preserve signaling-ness cross-platform, this
448-
/// implementation favours preserving the exact bits. This means that
448+
/// implementation favors preserving the exact bits. This means that
449449
/// any payloads encoded in NaNs will be preserved even if the result of
450450
/// this method is sent over the network from an x86 machine to a MIPS one.
451451
///

src/libcore/task/wake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl Drop for Waker {
108108
/// is ready to be run.
109109
///
110110
/// This is similar to the `Waker` type, but cannot be sent across threads.
111-
/// Task executors can use this type to implement more optimized singlethreaded wakeup
111+
/// Task executors can use this type to implement more optimized single-threaded wakeup
112112
/// behavior.
113113
#[repr(transparent)]
114114
#[derive(Clone)]

src/libproc_macro/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ impl TokenTree {
535535
}
536536
}
537537

538-
/// Prints token treee in a form convenient for debugging.
538+
/// Prints token tree in a form convenient for debugging.
539539
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
540540
impl fmt::Debug for TokenTree {
541541
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -730,7 +730,7 @@ impl fmt::Debug for Group {
730730

731731
/// An `Punct` is an single punctuation character like `+`, `-` or `#`.
732732
///
733-
/// Multicharacter operators like `+=` are represented as two instances of `Punct` with different
733+
/// Multi-character operators like `+=` are represented as two instances of `Punct` with different
734734
/// forms of `Spacing` returned.
735735
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
736736
#[derive(Clone)]
@@ -788,7 +788,7 @@ impl Punct {
788788

789789
/// Returns the spacing of this punctuation character, indicating whether it's immediately
790790
/// followed by another `Punct` in the token stream, so they can potentially be combined into
791-
/// a multicharacter operator (`Joint`), or it's followed by some other token or whitespace
791+
/// a multi-character operator (`Joint`), or it's followed by some other token or whitespace
792792
/// (`Alone`) so the operator has certainly ended.
793793
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
794794
pub fn spacing(&self) -> Spacing {
@@ -947,7 +947,7 @@ macro_rules! suffixed_int_literals {
947947
/// This function will create an integer like `1u32` where the integer
948948
/// value specified is the first part of the token and the integral is
949949
/// also suffixed at the end.
950-
/// Literals created from negative numbers may not survive rountrips through
950+
/// Literals created from negative numbers may not survive round-trips through
951951
/// `TokenStream` or strings and may be broken into two tokens (`-` and positive literal).
952952
///
953953
/// Literals created through this method have the `Span::call_site()`
@@ -1047,7 +1047,7 @@ impl Literal {
10471047

10481048
/// Creates a new suffixed floating-point literal.
10491049
///
1050-
/// This consturctor will create a literal like `1.0f32` where the value
1050+
/// This constructor will create a literal like `1.0f32` where the value
10511051
/// specified is the preceding part of the token and `f32` is the suffix of
10521052
/// the token. This token will always be inferred to be an `f32` in the
10531053
/// compiler.
@@ -1096,7 +1096,7 @@ impl Literal {
10961096

10971097
/// Creates a new suffixed floating-point literal.
10981098
///
1099-
/// This consturctor will create a literal like `1.0f64` where the value
1099+
/// This constructor will create a literal like `1.0f64` where the value
11001100
/// specified is the preceding part of the token and `f64` is the suffix of
11011101
/// the token. This token will always be inferred to be an `f64` in the
11021102
/// compiler.

src/librustc/dep_graph/cgu_reuse_tracker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
//! Some facilities for tracking how codegen-units are reused during incremental
12-
//! compilition. This is used for incremental compiliation tests and debug
12+
//! compilation. This is used for incremental compilation tests and debug
1313
//! output.
1414
1515
use session::Session;

src/librustc/hir/def.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub enum NonMacroAttrKind {
3636
Tool,
3737
/// Single-segment custom attribute registered by a derive macro (`#[serde(default)]`).
3838
DeriveHelper,
39-
/// Single-segment custom attriubte registered by a legacy plugin (`register_attribute`).
39+
/// Single-segment custom attribute registered by a legacy plugin (`register_attribute`).
4040
LegacyPluginHelper,
4141
/// Single-segment custom attribute not registered in any way (`#[my_attr]`).
4242
Custom,

src/librustc/infer/canonical/canonicalizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! This module contains the "canonicalizer" itself.
1212
//!
13-
//! For an overview of what canonicaliation is and how it fits into
13+
//! For an overview of what canonicalization is and how it fits into
1414
//! rustc, check out the [chapter in the rustc guide][c].
1515
//!
1616
//! [c]: https://rust-lang-nursery.github.io/rustc-guide/traits/canonicalization.html

src/librustc/infer/canonical/query_response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
556556
}
557557

558558
/// Given two sets of values for the same set of canonical variables, unify them.
559-
/// The second set is produced lazilly by supplying indices from the first set.
559+
/// The second set is produced lazily by supplying indices from the first set.
560560
fn unify_canonical_vars(
561561
&self,
562562
cause: &ObligationCause<'tcx>,

src/librustc/infer/canonical/substitute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! This module contains code to substitute new values into a
1212
//! `Canonical<'tcx, T>`.
1313
//!
14-
//! For an overview of what canonicaliation is and how it fits into
14+
//! For an overview of what canonicalization is and how it fits into
1515
//! rustc, check out the [chapter in the rustc guide][c].
1616
//!
1717
//! [c]: https://rust-lang-nursery.github.io/rustc-guide/traits/canonicalization.html

0 commit comments

Comments
 (0)