---

yaml
---
r: 90534
b: refs/heads/master
c: e2fa3c3
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f43402fd66d22842978e952c548125db66b3491f
+refs/heads/master: e2fa3c3af79df48776dabcdf9291534822e6f874
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/configure

@@ -469,8 +469,8 @@ then
     PV_MINOR=${PV_MAJOR_MINOR#* }
     if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
     then
-        step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
-        BAD_PANDOC=1
+		step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
+		BAD_PANDOC=1
     fi
 fi
 
@@ -544,45 +544,12 @@ then
     putvar CFG_ENABLE_CLANG
 fi
 
+
 if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
 then
     err "either clang or gcc is required"
 fi
 
-# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
-# system, so if we find that gcc is clang, we should just use clang directly.
-if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
-then
-    CFG_OSX_GCC_VERSION=$("$CFG_GCC" --version 2>&1 | grep "Apple LLVM version")
-    if [ $? -eq 0 ]
-    then
-        step_msg "on OS X 10.9, forcing use of clang"
-        CFG_ENABLE_CLANG=1
-        putvar CFG_ENABLE_CLANG
-    else 
-        # on OS X, with xcode 5 and newer, certain developers may have 
-        # cc, gcc and g++ point to a  mixture of clang and gcc
-        # if so, this will create very strange build errors 
-        # this last stanza is to detect some such problems and save the future rust
-        # contributor some time solving that issue.
-        # this detection could be generalized to other OSes aside from OS X
-        # but the issue seems most likely to happen on OS X
-
-        chk_cc () {
-            $1 --version 2> /dev/null | grep -q $2
-        }
-        # check that gcc, cc and g++ all point to the same compiler.
-        # note that for xcode 5, g++ points to clang, not clang++
-        if !((chk_cc gcc clang  && chk_cc g++ clang) ||
-            (chk_cc gcc gcc  &&( chk_cc g++ g++ || chk g++ gcc))) then
-            err "the gcc and g++ in your path point to different compilers. 
-Check which versions are in your path with  cc --version and g++ --version. 
-To resolve this problem, either fix your PATH  or run configure with --enable-clang"
-        fi
-
-    fi
-fi
-
 if [ ! -z "$CFG_LLVM_ROOT" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
 then
     step_msg "using custom LLVM at $CFG_LLVM_ROOT"
@@ -591,20 +558,20 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.3|3.3svn|3.2|3.2svn)
-            msg "found ok version of LLVM: $LLVM_VERSION"
-            ;;
-        (*)
-            err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
-            ;;
+	(3.3|3.3svn|3.2|3.2svn)
+	    msg "found ok version of LLVM: $LLVM_VERSION"
+	    ;;
+	(*)
+	    err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
+	    ;;
     esac
 fi
 
 if [ ! -z "$CFG_ENABLE_CLANG" ]
 then
     if [ -z "$CFG_CLANG" ]
     then
-        err "clang requested but not found"
+	err "clang requested but not found"
     fi
     CFG_CLANG_VERSION=$("$CFG_CLANG" \
                       --version \

trunk/doc/manual.inc

@@ -5,6 +5,8 @@
     padding-left: 2em;
   }
   #influences blockquote p:last-child {
-    color: #999;
+    display: block;
+    line-height: 1.428571429;
+    color: #999999;
   }
-</style>
+</style>

trunk/doc/po/ja/tutorial-ffi.md.po

@@ -168,7 +168,7 @@ msgid ""
 "~~~~ {.xfail-test}\n"
 "pub fn validate_compressed_buffer(src: &[u8]) -> bool {\n"
 "    unsafe {\n"
-"        snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0\n"
+"        snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0\n"
 "    }\n"
 "}\n"
 "~~~~\n"
@@ -207,7 +207,7 @@ msgid ""
 "pub fn compress(src: &[u8]) -> ~[u8] {\n"
 "    unsafe {\n"
 "        let srclen = src.len() as size_t;\n"
-"        let psrc = src.as_ptr();\n"
+"        let psrc = vec::raw::to_ptr(src);\n"
 msgstr ""
 
 #. type: Plain text
@@ -216,15 +216,15 @@ msgstr ""
 msgid ""
 "        let mut dstlen = snappy_max_compressed_length(srclen);\n"
 "        let mut dst = vec::with_capacity(dstlen as uint);\n"
-"        let pdst = dst.as_mut_ptr();\n"
+"        let pdst = vec::raw::to_mut_ptr(dst);\n"
 msgstr ""
 
 #. type: Plain text
 #: doc/tutorial-ffi.md:113
 #, no-wrap
 msgid ""
 "        snappy_compress(psrc, srclen, pdst, &mut dstlen);\n"
-"        dst.set_len(dstlen as uint);\n"
+"        vec::raw::set_len(&mut dst, dstlen as uint);\n"
 "        dst\n"
 "    }\n"
 "}\n"
@@ -247,7 +247,7 @@ msgid ""
 "pub fn uncompress(src: &[u8]) -> Option<~[u8]> {\n"
 "    unsafe {\n"
 "        let srclen = src.len() as size_t;\n"
-"        let psrc = src.as_ptr();\n"
+"        let psrc = vec::raw::to_ptr(src);\n"
 msgstr ""
 
 #. type: Plain text
@@ -263,15 +263,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 "        let mut dst = vec::with_capacity(dstlen as uint);\n"
-"        let pdst = dst.as_mut_ptr();\n"
+"        let pdst = vec::raw::to_mut_ptr(dst);\n"
 msgstr ""
 
 #. type: Plain text
 #: doc/tutorial-ffi.md:138
 #, no-wrap
 msgid ""
 "        if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {\n"
-"            dst.set_len(dstlen as uint);\n"
+"            vec::raw::set_len(&mut dst, dstlen as uint);\n"
 "            Some(dst)\n"
 "        } else {\n"
 "            None // SNAPPY_INVALID_INPUT\n"

trunk/doc/po/tutorial-ffi.md.pot

@@ -168,7 +168,7 @@ msgid ""
 "~~~~ {.xfail-test}\n"
 "pub fn validate_compressed_buffer(src: &[u8]) -> bool {\n"
 "    unsafe {\n"
-"        snappy_validate_compressed_buffer(src.as_ptr(), src.len() as size_t) == 0\n"
+"        snappy_validate_compressed_buffer(vec::raw::to_ptr(src), src.len() as size_t) == 0\n"
 "    }\n"
 "}\n"
 "~~~~\n"
@@ -207,7 +207,7 @@ msgid ""
 "pub fn compress(src: &[u8]) -> ~[u8] {\n"
 "    unsafe {\n"
 "        let srclen = src.len() as size_t;\n"
-"        let psrc = src.as_ptr();\n"
+"        let psrc = vec::raw::to_ptr(src);\n"
 msgstr ""
 
 #. type: Plain text
@@ -216,15 +216,15 @@ msgstr ""
 msgid ""
 "        let mut dstlen = snappy_max_compressed_length(srclen);\n"
 "        let mut dst = vec::with_capacity(dstlen as uint);\n"
-"        let pdst = dst.as_mut_ptr();\n"
+"        let pdst = vec::raw::to_mut_ptr(dst);\n"
 msgstr ""
 
 #. type: Plain text
 #: doc/tutorial-ffi.md:113
 #, no-wrap
 msgid ""
 "        snappy_compress(psrc, srclen, pdst, &mut dstlen);\n"
-"        dst.set_len(dstlen as uint);\n"
+"        vec::raw::set_len(&mut dst, dstlen as uint);\n"
 "        dst\n"
 "    }\n"
 "}\n"
@@ -247,7 +247,7 @@ msgid ""
 "pub fn uncompress(src: &[u8]) -> Option<~[u8]> {\n"
 "    unsafe {\n"
 "        let srclen = src.len() as size_t;\n"
-"        let psrc = src.as_ptr();\n"
+"        let psrc = vec::raw::to_ptr(src);\n"
 msgstr ""
 
 #. type: Plain text
@@ -263,15 +263,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 "        let mut dst = vec::with_capacity(dstlen as uint);\n"
-"        let pdst = dst.as_mut_ptr();\n"
+"        let pdst = vec::raw::to_mut_ptr(dst);\n"
 msgstr ""
 
 #. type: Plain text
 #: doc/tutorial-ffi.md:138
 #, no-wrap
 msgid ""
 "        if snappy_uncompress(psrc, srclen, pdst, &mut dstlen) == 0 {\n"
-"            dst.set_len(dstlen as uint);\n"
+"            vec::raw::set_len(&mut dst, dstlen as uint);\n"
 "            Some(dst)\n"
 "        } else {\n"
 "            None // SNAPPY_INVALID_INPUT\n"