---

yaml
---
r: 60855
b: refs/heads/auto
c: 308774e
h: refs/heads/master
i:
  60853: b842f0c
  60851: 0002820
  60847: e894f8f
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ 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: a9c3b3885da3395427773a2f48a0e1f9f033551b
+refs/heads/auto: 308774e05b8c42e900d2c6125852f670cbc7dd85
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/configure

@@ -970,6 +970,13 @@ then
     putvar CFG_CCACHE_CPP2
 fi
 
+if [ ! -z "$CFG_ENABLE_CCACHE" ]
+then
+    CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
+    putvar CFG_CCACHE_BASEDIR
+fi
+
+
 if [ ! -z $BAD_PANDOC ]
 then
     CFG_PANDOC=

branches/auto/mk/platform.mk

@@ -396,6 +396,11 @@ ifeq ($(CFG_CCACHE_CPP2),1)
   export CCACHE_CPP
 endif
 
+ifdef CFG_CCACHE_BASEDIR
+  CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
+  export CCACHE_BASEDIR
+endif
+
 define CFG_MAKE_TOOLCHAIN
   CFG_COMPILE_C_$(1) = $$(CC_$(1))  \
         $$(CFG_GCCISH_CFLAGS)      \

branches/auto/src/etc/zsh/_rust

@@ -421,7 +421,7 @@ pub fn check_durable(tcx: ty::ctxt, ty: ty::t, sp: span) -> bool {
         match ty::get(ty).sty {
           ty::ty_param(*) => {
             tcx.sess.span_err(sp, "value may contain borrowed \
-                                   pointers; use `'static` bound");
+                                   pointers; add `'static` bound");
           }
           _ => {
             tcx.sess.span_err(sp, "value may contain borrowed \

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

@@ -37,7 +37,7 @@ fn to_foo_2<T:Copy>(t: T) -> @foo {
     // Not OK---T may contain borrowed ptrs and it is going to escape
     // as part of the returned foo value
     struct F<T> { f: T }
-    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; use `'static` bound
+    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound
 }
 
 fn to_foo_3<T:Copy + 'static>(t: T) -> @foo {

branches/auto/src/test/compile-fail/kindck-owned-trait-scoped.rs

@@ -11,7 +11,7 @@
 trait foo { fn foo(&self); }
 
 fn to_foo<T:Copy + foo>(t: T) -> @foo {
-    @t as @foo //~ ERROR value may contain borrowed pointers; use `'static` bound
+    @t as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound
 }
 
 fn to_foo2<T:Copy + foo + 'static>(t: T) -> @foo {