diff options
| author | bors <bors@rust-lang.org> | 2014-06-25 13:36:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-25 13:36:21 +0000 |
| commit | 2f74325fcfcf0e8bc478674f996a190f6a58b20c (patch) | |
| tree | 5fe46ef85bdc486dd3810d31ef0bee288ef39ca0 /src/libstd | |
| parent | bab614f5fa725d248afc5f0530c835f37998ce8f (diff) | |
| parent | beff6101026334ce8b04b08c34062acffbd044fd (diff) | |
| download | rust-2f74325fcfcf0e8bc478674f996a190f6a58b20c.tar.gz rust-2f74325fcfcf0e8bc478674f996a190f6a58b20c.zip | |
auto merge of #15174 : alco/rust/patch-1, r=alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fmt.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs index b1164981c0b..ef0c59268c3 100644 --- a/src/libstd/fmt.rs +++ b/src/libstd/fmt.rs @@ -101,8 +101,8 @@ format!("{a:s} {c:d} {b:?}", a="a", b=(), c=3i); // => "a 3 ()" ``` It is illegal to put positional parameters (those without names) after arguments -which have names. Like positional parameters, it is illegal to provided named -parameters that are unused by the format string. +which have names. Like with positional parameters, it is illegal to provide +named parameters that are unused by the format string. ### Argument types @@ -185,7 +185,7 @@ struct. In order to help with this, the `Formatter` struct also provides some helper methods. Additionally, the return value of this function is `fmt::Result` which is a -typedef to `Result<(), IoError>` (also known as `IoError<()>`). Formatting +typedef to `Result<(), IoError>` (also known as `IoResult<()>`). Formatting implementations should ensure that they return errors from `write!` correctly (propagating errors upward). |
