---

yaml
---
r: 102585
b: refs/heads/auto
c: 3e0eb3c
h: refs/heads/master
i:
  102583: be1590b
v: v3

Author: bors

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: fdf985cd14d7f83181527c7d911b1b7b7d7b3d65
+refs/heads/auto: 3e0eb3c0bf9a220e4e44014df08ffd2d1194315b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/doc/rust.md

@@ -482,7 +482,7 @@ syntax, and yet are not implementable as functions. Instead, they are given
 names, and invoked through a consistent syntax: `name!(...)`. Examples
 include:
 
-* `fmt!` : format data into a string
+* `format!` : format data into a string
 * `env!` : look up an environment variable's value at compile time
 * `file!`: return the path to the file being compiled
 * `stringify!` : pretty-print the Rust expression given as an argument
@@ -1975,10 +1975,6 @@ Supported traits for `deriving` are:
 * `Rand`, to create a random instance of a data type.
 * `Default`, to create an empty instance of a data type.
 * `Zero`, to create an zero instance of a numeric data type.
-* `ToStr`, to convert to a string. For a type with this instance,
-  `obj.to_str()` has similar output as `fmt!("%?", obj)`, but it differs in that
-  each constituent field of the type must also implement `ToStr` and will have
-  `field.to_str()` invoked to build up the result.
 * `FromPrimitive`, to create an instance from a numeric primitve.
 
 ### Stability