Skip to content

Commit 3752673

Browse files
author
Jonathan Turner
authored
Rollup merge of rust-lang#37473 - joshtriplett:doc-copyedit-write-writeln, r=alexcrichton
Copyediting on documentation for write! and writeln! Fix various sentence fragments, missing articles, and other grammatical issues in the documentation for write! and writeln!. Also fix the links (and link names) for common return types. (Noticed when preparing rust-lang#37472 ; posted separately to avoid mixing the new documentation with copyedits to existing documentation.)
2 parents dbb2506 + 07bff08 commit 3752673

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

src/libcore/macros.rs

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -317,26 +317,27 @@ macro_rules! try {
317317

318318
/// Write formatted data into a buffer
319319
///
320-
/// This macro accepts any value with `write_fmt` method as a writer, a format string, and a list
321-
/// of arguments to format.
320+
/// This macro accepts a 'writer' (any value with a `write_fmt` method), a format string, and a
321+
/// list of arguments to format.
322322
///
323-
/// `write_fmt` method usually comes from an implementation of [`std::fmt::Write`][fmt_write] or
324-
/// [`std::io::Write`][io_write] traits. These are sometimes called 'writers'.
323+
/// The `write_fmt` method usually comes from an implementation of [`std::fmt::Write`][fmt_write]
324+
/// or [`std::io::Write`][io_write] traits. The term 'writer' refers to an implementation of one of
325+
/// these two traits.
325326
///
326327
/// Passed arguments will be formatted according to the specified format string and the resulting
327328
/// string will be passed to the writer.
328329
///
329330
/// See [`std::fmt`][fmt] for more information on format syntax.
330331
///
331-
/// Return value is completely dependent on the 'write_fmt' method.
332+
/// `write!` returns whatever the 'write_fmt' method returns.
332333
///
333-
/// Common return values are: [`Result`][enum_result], [`io::Result`][type_result]
334+
/// Common return values include: [`fmt::Result`][fmt_result], [`io::Result`][io_result]
334335
///
335336
/// [fmt]: ../std/fmt/index.html
336337
/// [fmt_write]: ../std/fmt/trait.Write.html
337338
/// [io_write]: ../std/io/trait.Write.html
338-
/// [enum_result]: ../std/result/enum.Result.html
339-
/// [type_result]: ../std/io/type.Result.html
339+
/// [fmt_result]: ../std/fmt/type.Result.html
340+
/// [io_result]: ../std/io/type.Result.html
340341
///
341342
/// # Examples
342343
///
@@ -355,31 +356,32 @@ macro_rules! write {
355356
($dst:expr, $($arg:tt)*) => ($dst.write_fmt(format_args!($($arg)*)))
356357
}
357358

358-
/// Write formatted data into a buffer, with appending a newline.
359+
/// Write formatted data into a buffer, with a newline appended.
359360
///
360361
/// On all platforms, the newline is the LINE FEED character (`\n`/`U+000A`) alone
361362
/// (no additional CARRIAGE RETURN (`\r`/`U+000D`).
362363
///
363-
/// This macro accepts any value with `write_fmt` method as a writer, a format string, and a list
364-
/// of arguments to format.
364+
/// This macro accepts a 'writer' (any value with a `write_fmt` method), a format string, and a
365+
/// list of arguments to format.
365366
///
366-
/// `write_fmt` method usually comes from an implementation of [`std::fmt::Write`][fmt_write] or
367-
/// [`std::io::Write`][io_write] traits. These are sometimes called 'writers'.
367+
/// The `write_fmt` method usually comes from an implementation of [`std::fmt::Write`][fmt_write]
368+
/// or [`std::io::Write`][io_write] traits. The term 'writer' refers to an implementation of one of
369+
/// these two traits.
368370
///
369371
/// Passed arguments will be formatted according to the specified format string and the resulting
370-
/// string will be passed to the writer.
372+
/// string will be passed to the writer, along with the appended newline.
371373
///
372374
/// See [`std::fmt`][fmt] for more information on format syntax.
373375
///
374-
/// Return value is completely dependent on the 'write_fmt' method.
376+
/// `write!` returns whatever the 'write_fmt' method returns.
375377
///
376-
/// Common return values are: [`Result`][enum_result], [`io::Result`][type_result]
378+
/// Common return values include: [`fmt::Result`][fmt_result], [`io::Result`][io_result]
377379
///
378380
/// [fmt]: ../std/fmt/index.html
379381
/// [fmt_write]: ../std/fmt/trait.Write.html
380382
/// [io_write]: ../std/io/trait.Write.html
381-
/// [enum_result]: ../std/result/enum.Result.html
382-
/// [type_result]: ../std/io/type.Result.html
383+
/// [fmt_result]: ../std/fmt/type.Result.html
384+
/// [io_result]: ../std/io/type.Result.html
383385
///
384386
/// # Examples
385387
///

0 commit comments

Comments
 (0)