---

yaml
---
r: 104561
b: refs/heads/try
c: 9083cb2
h: refs/heads/master
i:
  104559: 006e0db
v: v3

Author: lifthrasiir

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: 5737d1f70459d03b219c8dadb8ac71c26e7e49d8
+refs/heads/try: 9083cb24b2739e04ea1e0a90a14740939f8cfeed
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/doc/tutorial.md

@@ -2786,11 +2786,11 @@ src/animals.rs
 
     src/mammals/humans.rs
     src/mammals/humans/mod.rs
-~~~
+~~
 
 If the animals file is `src/animals/mod.rs`, `rustc` will look for:
 
-~~~ {.notrust}
+~~ {.notrust}
 src/animals/mod.rs
     src/animals/fish.rs
     src/animals/fish/mod.rs

branches/try/src/librustc/middle/kind.rs

@@ -315,7 +315,7 @@ pub fn check_expr(cx: &mut Context, e: &Expr) {
     match e.node {
         ExprUnary(UnBox, interior) => {
             let interior_type = ty::expr_ty(cx.tcx, interior);
-            let _ = check_durable(cx.tcx, interior_type, interior.span);
+            let _ = check_static(cx.tcx, interior_type, interior.span);
         }
         ExprCast(source, _) => {
             let source_ty = ty::expr_ty(cx.tcx, source);
@@ -474,13 +474,13 @@ pub fn check_send(cx: &Context, ty: ty::t, sp: Span) -> bool {
     }
 }
 
-// note: also used from middle::typeck::regionck!
-pub fn check_durable(tcx: ty::ctxt, ty: ty::t, sp: Span) -> bool {
+pub fn check_static(tcx: ty::ctxt, ty: ty::t, sp: Span) -> bool {
     if !ty::type_is_static(tcx, ty) {
         match ty::get(ty).sty {
           ty::ty_param(..) => {
-            tcx.sess.span_err(sp, "value may contain references; \
-                                   add `'static` bound");
+            tcx.sess.span_err(sp,
+                format!("value may contain references; \
+                         add `'static` bound to `{}`", ty_to_str(tcx, ty)));
           }
           _ => {
             tcx.sess.span_err(sp, "value may contain references");
@@ -578,7 +578,7 @@ pub fn check_cast_for_escaping_regions(
                     if target_params.iter().any(|x| x == &source_param) {
                         /* case (2) */
                     } else {
-                        check_durable(cx.tcx, ty, source_span); /* case (3) */
+                        check_static(cx.tcx, ty, source_span); /* case (3) */
                     }
                 }
                 _ => {}

branches/try/src/libstd/io/mod.rs

@@ -214,32 +214,46 @@ pub use self::buffered::{BufferedReader, BufferedWriter, BufferedStream,
                          LineBufferedWriter};
 pub use self::comm_adapters::{PortReader, ChanWriter};
 
+/// Various utility functions useful for writing I/O tests
 pub mod test;
 
+/// Synchronous, non-blocking filesystem operations.
 pub mod fs;
 
+/// Synchronous, in-memory I/O.
 pub mod pipe;
 
+/// Child process management.
 pub mod process;
 
+/// Synchronous, non-blocking network I/O.
 pub mod net;
 
+/// Readers and Writers for memory buffers and strings.
 mod mem;
 
+/// Non-blocking access to stdin, stdout, stderr
 pub mod stdio;
 
+/// Implementations for Result
 mod result;
 
+/// Extension traits
 pub mod extensions;
 
+/// Basic Timer
 pub mod timer;
 
+/// Buffered I/O wrappers
 mod buffered;
 
+/// Signal handling
 pub mod signal;
 
+/// Utility implementations of Reader and Writer
 pub mod util;
 
+/// Adapatation of Chan/Port types to a Writer/Reader type.
 mod comm_adapters;
 
 /// The default buffer size for various I/O operations

branches/try/src/libstd/io/stdio.rs

@@ -8,12 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/*! Non-blocking access to stdin, stdout, and stderr.
+/*!
 
-This module provides bindings to the local event loop's TTY interface, using it
-to offer synchronous but non-blocking versions of stdio. These handles can be
-inspected for information about terminal dimensions or for related information
-about the stream or terminal to which it is attached.
+This modules provides bindings to the local event loop's TTY interface, using it
+to have synchronous, but non-blocking versions of stdio. These handles can be
+inspected for information about terminal dimensions or related information
+about the stream or terminal that it is attached to.
 
 # Example
 

branches/try/src/libstd/io/test.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/*! Various utility functions useful for writing I/O tests */
-
 #[macro_escape];
 
 use os;

branches/try/src/libstd/io/util.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/*! Utility implementations of Reader and Writer */
-
 use prelude::*;
 use cmp;
 use io;

branches/try/src/test/compile-fail/owned-ptr-static-bound.rs

@@ -0,0 +1,30 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait A<T> {}
+struct B<'a, T>(&'a A<T>);
+
+trait X {}
+impl<'a, T> X for B<'a, T> {}
+
+fn f<'a, T, U>(v: ~A<T>) -> ~X: {
+    ~B(v) as ~X: //~ ERROR value may contain references; add `'static` bound to `T`
+}
+
+fn g<'a, T, U>(v: ~A<U>) -> ~X: {
+    ~B(v) as ~X: //~ ERROR value may contain references; add `'static` bound to `U`
+}
+
+fn h<'a, T: 'static>(v: ~A<T>) -> ~X: {
+    ~B(v) as ~X: // ok
+}
+
+fn main() {}
+