rollup merge of #19614: steveklabnik/gh19599

Fixes #19599
2014-12-09 09:25:04 -08:00 · 2014-12-09 09:25:04 -08:00 · fb587f1f9b
commit fb587f1f9b
parent ae805da487 8ba5605233
10 changed files with 75 additions and 75 deletions
--- a/src/librand/chacha.rs
+++ b/src/librand/chacha.rs
@ -117,7 +117,7 @@ impl ChaChaRng {
    /// security proof for a more involved example of this.
    ///
    /// The modified word layout is:
-    /// ```notrust
+    /// ```ignore
    /// constant constant constant constant
    /// key      key      key      key
    /// key      key      key      key