Skip to content

Commit 2e9db8d

Browse files
authored
Rollup merge of #71962 - jsoref:grammar, r=Dylan-DPC
Grammar I've split this into individual changes so that people can veto individually. I'm not attached to most of them. `zeroes` vs. `zeros` is why I took the effort to run this through app.grammarly (which disappointingly didn't even notice).
2 parents 9e4a745 + 6c8c3f8 commit 2e9db8d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/liballoc/fmt.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
//! The internal iterator over the argument has not been advanced by the time
5151
//! the first `{}` is seen, so it prints the first argument. Then upon reaching
5252
//! the second `{}`, the iterator has advanced forward to the second argument.
53-
//! Essentially, parameters which explicitly name their argument do not affect
54-
//! parameters which do not name an argument in terms of positional specifiers.
53+
//! Essentially, parameters that explicitly name their argument do not affect
54+
//! parameters that do not name an argument in terms of positional specifiers.
5555
//!
5656
//! A format string is required to use all of its arguments, otherwise it is a
5757
//! compile-time error. You may refer to the same argument more than once in the
@@ -60,7 +60,7 @@
6060
//! ## Named parameters
6161
//!
6262
//! Rust itself does not have a Python-like equivalent of named parameters to a
63-
//! function, but the [`format!`] macro is a syntax extension which allows it to
63+
//! function, but the [`format!`] macro is a syntax extension that allows it to
6464
//! leverage named parameters. Named parameters are listed at the end of the
6565
//! argument list and have the syntax:
6666
//!
@@ -77,7 +77,7 @@
7777
//! ```
7878
//!
7979
//! It is not valid to put positional parameters (those without names) after
80-
//! arguments which have names. Like with positional parameters, it is not
80+
//! arguments that have names. Like with positional parameters, it is not
8181
//! valid to provide named parameters that are unused by the format string.
8282
//!
8383
//! # Formatting Parameters
@@ -130,7 +130,7 @@
130130
//!
131131
//! The default [fill/alignment](#fillalignment) for non-numerics is a space and
132132
//! left-aligned. The
133-
//! defaults for numeric formatters is also a space but with right-alignment. If
133+
//! default for numeric formatters is also a space character but with right-alignment. If
134134
//! the `0` flag (see below) is specified for numerics, then the implicit fill character is
135135
//! `0`.
136136
//!
@@ -161,7 +161,7 @@
161161
//! `Signed` trait. This flag indicates that the correct sign (`+` or `-`)
162162
//! should always be printed.
163163
//! * `-` - Currently not used
164-
//! * `#` - This flag is indicates that the "alternate" form of printing should
164+
//! * `#` - This flag indicates that the "alternate" form of printing should
165165
//! be used. The alternate forms are:
166166
//! * `#?` - pretty-print the [`Debug`] formatting
167167
//! * `#x` - precedes the argument with a `0x`
@@ -173,9 +173,9 @@
173173
//! like `{:08}` would yield `00000001` for the integer `1`, while the
174174
//! same format would yield `-0000001` for the integer `-1`. Notice that
175175
//! the negative version has one fewer zero than the positive version.
176-
//! Note that padding zeroes are always placed after the sign (if any)
176+
//! Note that padding zeros are always placed after the sign (if any)
177177
//! and before the digits. When used together with the `#` flag, a similar
178-
//! rule applies: padding zeroes are inserted after the prefix but before
178+
//! rule applies: padding zeros are inserted after the prefix but before
179179
//! the digits. The prefix is included in the total width.
180180
//!
181181
//! ## Precision
@@ -251,7 +251,7 @@
251251
//!
252252
//! In some programming languages, the behavior of string formatting functions
253253
//! depends on the operating system's locale setting. The format functions
254-
//! provided by Rust's standard library do not have any concept of locale, and
254+
//! provided by Rust's standard library do not have any concept of locale and
255255
//! will produce the same results on all systems regardless of user
256256
//! configuration.
257257
//!
@@ -470,7 +470,7 @@
470470
//!
471471
//! ### `format_args!`
472472
//!
473-
//! This is a curious macro which is used to safely pass around
473+
//! This is a curious macro used to safely pass around
474474
//! an opaque object describing the format string. This object
475475
//! does not require any heap allocations to create, and it only
476476
//! references information on the stack. Under the hood, all of
@@ -495,7 +495,7 @@
495495
//! This structure can then be passed to the [`write`] and [`format`] functions
496496
//! inside this module in order to process the format string.
497497
//! The goal of this macro is to even further prevent intermediate allocations
498-
//! when dealing formatting strings.
498+
//! when dealing with formatting strings.
499499
//!
500500
//! For example, a logging library could use the standard formatting syntax, but
501501
//! it would internally pass around this structure until it has been determined

0 commit comments

Comments
 (0)