---

yaml
---
r: 148831
b: refs/heads/try2
c: 3e0eb3c
h: refs/heads/master
i:
  148829: 319f749
  148827: 1a375ea
  148823: ebc9cb6
  148815: f0c39a8
  148799: 29234b9
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: fdf985cd14d7f83181527c7d911b1b7b7d7b3d65
+refs/heads/try2: 3e0eb3c0bf9a220e4e44014df08ffd2d1194315b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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