about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-15 15:41:11 -0700
committerbors <bors@rust-lang.org>2013-08-15 15:41:11 -0700
commitc4656cfd045ef436377b3dfeebaa265c2c92a00f (patch)
treee9ace0b1d4b60583df7de0551f3a33bc301978e4 /src/libstd
parent5c0d1923bc3e26da1b6e043be49147f68ee2444f (diff)
parent1764e207fb2cec0c656e1acd0e07eefb9e6ac7b9 (diff)
downloadrust-c4656cfd045ef436377b3dfeebaa265c2c92a00f.tar.gz
rust-c4656cfd045ef436377b3dfeebaa265c2c92a00f.zip
auto merge of #8485 : alexcrichton/rust/add-tests, r=catamorphism
Closes #3907
Closes #5493
Closes #4464
Closes #4759
Closes #5666
Closes #5884
Closes #5926
Closes #6318
Closes #6557
Closes #6898
Closes #6919
Closes #7222
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fmt/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs
index 41e588934b7..70ec5d93199 100644
--- a/src/libstd/fmt/mod.rs
+++ b/src/libstd/fmt/mod.rs
@@ -93,7 +93,7 @@ string.
 Because formatting is done via traits, there is no requirement that the
 `d` format actually takes an `int`, but rather it simply requires a type which
 ascribes to the `Signed` formatting trait. There are various parameters which do
-require a particular type, however. Namely if the sytnax `{:.*s}` is used, then
+require a particular type, however. Namely if the syntax `{:.*s}` is used, then
 the number of characters to print from the string precedes the actual string and
 must have the type `uint`. Although a `uint` can be printed with `{:u}`, it is
 illegal to reference an argument as such. For example, this is another invalid