---

yaml
---
r: 160766
b: refs/heads/auto
c: b781c8b
h: refs/heads/master
v: v3

Author: ruuda

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 641e2a110de4bb1b2c2b596ef1168ae7865aa529
+refs/heads/auto: b781c8b08e5b6b207c0422454ab8f319c90fe64d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/AUTHORS.txt

@@ -121,7 +121,6 @@ Cole Mickens <[email protected]>
 Colin Davidson <[email protected]>
 Colin Sherratt <[email protected]>
 Conrad Kleinespel <[email protected]>
-Corey Farwell <[email protected]>
 Corey Ford <[email protected]>
 Corey Richardson <[email protected]>
 DJUrsus <[email protected]>

branches/auto/configure

@@ -893,10 +893,7 @@ CFG_PREFIX=${CFG_PREFIX%/}
 CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-CFG_SUPPORTED_TARGET=""
-for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
-  CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
-done
+CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""

branches/auto/mk/cfg/arm-apple-ios.mk renamed to branches/auto/mk/cfg/arm-apple-ios

@@ -113,7 +113,7 @@ $(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
 
 CFG_RLIB_GLOB=lib$(1)-*.rlib
 
-include $(wildcard $(CFG_SRC_DIR)mk/cfg/*.mk)
+include $(wildcard $(CFG_SRC_DIR)mk/cfg/*)
 
 # The -Qunused-arguments sidesteps spurious warnings from clang
 define FILTER_FLAGS

branches/auto/mk/cfg/arm-linux-androideabi.mk renamed to branches/auto/mk/cfg/arm-linux-androideabi

@@ -1566,7 +1566,7 @@ fn _arm_exec_compiled_test(config: &Config,
 
     let mut exitcode: int = 0;
     for c in exitcode_out.as_slice().chars() {
-        if !c.is_numeric() { break; }
+        if !c.is_digit() { break; }
         exitcode = exitcode * 10 + match c {
             '0' ... '9' => c as int - ('0' as int),
             _ => 101,

branches/auto/mk/cfg/arm-unknown-linux-gnueabi.mk renamed to branches/auto/mk/cfg/arm-unknown-linux-gnueabi

@@ -1334,12 +1334,7 @@ specific type; the type-specified aspects of a value include:
 For example, the type `(u8, u8)` defines the set of immutable values that are
 composite pairs, each containing two unsigned 8-bit integers accessed by
 pattern-matching and laid out in memory with the `x` component preceding the
-`y` component:
-
-```
-type Point = (u8, u8);
-let p: Point = (41, 68);
-```
+`y` component.
 
 ### Structures
 

branches/auto/mk/cfg/arm-unknown-linux-gnueabihf.mk renamed to branches/auto/mk/cfg/arm-unknown-linux-gnueabihf

@@ -1,35 +1,29 @@
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <[email protected]>
-" Latest Revision:  2014 Sep 24
+" Latest Revision:  2014 Sep 18
 
-if exists('current_compiler')
+if exists("current_compiler")
   finish
 endif
-runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
-if exists(':CompilerSet') != 2
+if exists(":CompilerSet") != 2
     command -nargs=* CompilerSet setlocal <args>
 endif
 
-if exists('g:cargo_makeprg_params')
-    execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
-else
-    CompilerSet makeprg=cargo\ $*
-endif
+CompilerSet errorformat&
+CompilerSet makeprg=cargo\ $*
 
 " Allow a configurable global Cargo.toml name. This makes it easy to
 " support variations like 'cargo.toml'.
-let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
+if !exists('g:cargo_toml_name')
+    let g:cargo_toml_name = 'Cargo.toml'
+endif
 
-function! s:is_absolute(path)
-    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
-endfunction
+let s:toml_dir = fnamemodify(findfile(g:cargo_toml_name, '.;'), ':p:h').'/'
 
-let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
-if s:local_manifest != ''
-    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
+if s:toml_dir != ''
     augroup cargo
         au!
         au QuickfixCmdPost make call s:FixPaths()
@@ -39,25 +33,15 @@ if s:local_manifest != ''
     " to be relative to the current directory instead of Cargo.toml.
     function! s:FixPaths()
         let qflist = getqflist()
-        let manifest = s:local_manifest
         for qf in qflist
-            if !qf.valid
-                let m = matchlist(qf.text, '(file://\(.*\))$')
-                if !empty(m)
-                    let manifest = m[1].'/'
-                    " Manually strip another slash if needed; usually just an
-                    " issue on Windows.
-                    if manifest =~ '^/[A-Z]\+:/'
-                        let manifest = manifest[1:]
-                    endif
-                endif
+            if !qf['valid']
                 continue
             endif
-            let filename = bufname(qf.bufnr)
-            if s:is_absolute(filename)
-                continue
+            let filename = bufname(qf['bufnr'])
+            if stridx(filename, s:toml_dir) == -1
+                let filename = s:toml_dir.filename
             endif
-            let qf.filename = simplify(manifest.filename)
+            let qf['filename'] = simplify(s:toml_dir.bufname(qf['bufnr']))
             call remove(qf, 'bufnr')
         endfor
         call setqflist(qflist, 'r')

branches/auto/mk/cfg/i386-apple-ios.mk renamed to branches/auto/mk/cfg/i386-apple-ios

@@ -53,15 +53,6 @@ g:rust_conceal_pub~
 	    let g:rust_conceal_pub = 1
 <
 
-                                                     *g:rust_recommended_style*
-g:rust_recommended_style~
-        Set this option to enable vim indentation and textwidth settings to
-        conform to style conventions of the rust standard library (i.e. use 4
-        spaces for indents and sets 'textwidth' to 99). This option is enabled
-	by default. To disable it: >
-	    let g:rust_recommended_style = 0
-<
-
                                                                  *g:rust_fold*
 g:rust_fold~
 	Set this option to turn on |folding|: >
@@ -88,13 +79,6 @@ g:ftplugin_rust_source_path~
 	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
 <
 
-                                                       *g:cargo_manifest_name*
-g:cargo_manifest_name~
-	Set this option to the name of the manifest file for your projects. If
-	not specified it defaults to 'Cargo.toml' : >
-	    let g:cargo_manifest_name = 'Cargo.toml'
-<
-
 ==============================================================================
 COMMANDS                                                       *rust-commands*
 

branches/auto/mk/cfg/i686-apple-darwin.mk renamed to branches/auto/mk/cfg/i686-apple-darwin

@@ -35,10 +35,9 @@ silent! setlocal formatoptions+=j
 " otherwise it's better than nothing.
 setlocal smartindent nocindent
 
-if !exists("g:rust_recommended_style") || g:rust_recommended_style == 1
-	setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
-	setlocal textwidth=99
-endif
+setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
+
+setlocal textwidth=99
 
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')

branches/auto/mk/cfg/i686-pc-windows-gnu.mk renamed to branches/auto/mk/cfg/i686-pc-windows-gnu

@@ -66,64 +66,69 @@ syn keyword   rustType        f64 i8 i16 i32 i64 str Self
 " This section is just straight transformation of the contents of the prelude,
 " to make it easy to update.
 
-" Reexported core operators {{{3
+" Core operators {{{3
 syn keyword   rustTrait       Copy Send Sized Sync
 syn keyword   rustTrait       Add Sub Mul Div Rem Neg Not
 syn keyword   rustTrait       BitAnd BitOr BitXor
 syn keyword   rustTrait       Drop Deref DerefMut
-syn keyword   rustTrait       Shl Shr
-syn keyword   rustTrait       Index IndexMut
-syn keyword   rustTrait       Slice SliceMut
-syn keyword   rustTrait       Fn FnMut FnOnce
+syn keyword   rustTrait       Shl Shr Index IndexMut
+syn keyword   rustEnum        Option
+syn keyword   rustEnumVariant Some None
+syn keyword   rustEnum        Result
+syn keyword   rustEnumVariant Ok Err
 
-" Reexported functions {{{3
-"syn keyword rustFunction range repeat
-"syn keyword rustFunction drop
+" Functions {{{3
 "syn keyword rustFunction from_str
+"syn keyword rustFunction range
+"syn keyword rustFunction drop
 
-" Reexported types and traits {{{3
+" Types and traits {{{3
 syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr
 syn keyword rustTrait IntoBytes
 syn keyword rustTrait ToCStr
 syn keyword rustTrait Char UnicodeChar
 syn keyword rustTrait Clone
-syn keyword rustTrait PartialEq PartialOrd Eq Ord
-syn keyword rustEnum Ordering Equiv
+syn keyword rustTrait PartialEq PartialOrd Eq Ord Equiv
+syn keyword rustEnum Ordering
 syn keyword rustEnumVariant Less Equal Greater
-syn keyword rustTrait FromIterator Extend ExactSize
+syn keyword rustTrait Collection Mutable Map MutableMap MutableSeq
+syn keyword rustTrait Set MutableSet
+syn keyword rustTrait FromIterator IntoIterator Extend ExactSize
 syn keyword rustTrait Iterator DoubleEndedIterator
 syn keyword rustTrait RandomAccessIterator CloneableIterator
 syn keyword rustTrait OrdIterator MutableDoubleEndedIterator
-syn keyword rustTrait ToPrimitive FromPrimitive
+syn keyword rustTrait NumCast Int SignedInt UnsignedInt Float
+syn keyword rustTrait FloatMath ToPrimitive FromPrimitive
 syn keyword rustTrait Box
-syn keyword rustEnum Option
-syn keyword rustEnumVariant Some None
 syn keyword rustTrait GenericPath Path PosixPath WindowsPath
-syn keyword rustTrait RawPtr RawMutPtr
-syn keyword rustEnum Result
-syn keyword rustEnumVariant Ok Err
-syn keyword rustTrait Buffer Writer Reader Seek BufferPrelude
-syn keyword rustTrait Str StrVector StrPrelude
-syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrPrelude
+syn keyword rustTrait RawPtr
+syn keyword rustTrait Buffer Writer Reader Seek
+syn keyword rustTrait Str StrVector StrSlice
+syn keyword rustTrait IntoMaybeOwned StrAllocating UnicodeStrSlice
+syn keyword rustTrait ToString IntoString
 syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4
 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12
-syn keyword rustTrait SlicePrelude AsSlice CloneSlicePrelude
-syn keyword rustTrait VectorVector PartialEqSlicePrelude OrdSlicePrelude
-syn keyword rustTrait CloneSliceAllocPrelude OrdSliceAllocPrelude SliceAllocPrelude
-syn keyword rustTrait IntoString String ToString
+syn keyword rustTrait CloneableVector ImmutableCloneableVector
+syn keyword rustTrait MutableCloneableSlice MutableOrdSlice
+syn keyword rustTrait ImmutableSlice MutableSlice
+syn keyword rustTrait ImmutablePartialEqSlice ImmutableOrdSlice
+syn keyword rustTrait Slice VectorVector
+syn keyword rustTrait MutableSliceAllocating
+syn keyword rustTrait String
 syn keyword rustTrait Vec
 
-" Reexported runtime types {{{3
 "syn keyword rustFunction sync_channel channel
 syn keyword rustTrait SyncSender Sender Receiver
 "syn keyword rustFunction spawn
 
-" Other syntax {{{2
+"syn keyword rustConstant GC
 
 syn keyword   rustSelf        self
 syn keyword   rustBoolean     true false
 
+" Other syntax {{{2
+
 " If foo::bar changes to foo.bar, change this ("::" to "\.").
 " If foo::bar changes to Foo::bar, change this (first "\w" to "\u").
 syn match     rustModPath     "\w\(\w\)*::[^<]"he=e-3,me=e-3

branches/auto/mk/cfg/i686-unknown-linux-gnu.mk renamed to branches/auto/mk/cfg/i686-unknown-linux-gnu

@@ -106,7 +106,7 @@ pub use core::slice::{OrdSlicePrelude, SlicePrelude, Items, MutItems};
 pub use core::slice::{ImmutableIntSlice, MutableIntSlice};
 pub use core::slice::{MutSplits, MutChunks, Splits};
 pub use core::slice::{bytes, mut_ref_slice, ref_slice, CloneSlicePrelude};
-pub use core::slice::{Found, NotFound, from_raw_buf, from_raw_mut_buf};
+pub use core::slice::{Found, NotFound};
 
 // Functional utilities
 

branches/auto/mk/cfg/mips-unknown-linux-gnu.mk renamed to branches/auto/mk/cfg/mips-unknown-linux-gnu

@@ -74,13 +74,11 @@ use vec::Vec;
 pub use core::str::{from_utf8, CharEq, Chars, CharOffsets};
 pub use core::str::{Bytes, CharSplits};
 pub use core::str::{CharSplitsN, AnyLines, MatchIndices, StrSplits};
-pub use core::str::{Utf16Encoder, Utf16CodeUnits};
-pub use core::str::{eq_slice, is_utf8, is_utf16, Utf16Items};
+pub use core::str::{Utf16CodeUnits, eq_slice, is_utf8, is_utf16, Utf16Items};
 pub use core::str::{Utf16Item, ScalarValue, LoneSurrogate, utf16_items};
 pub use core::str::{truncate_utf16_at_nul, utf8_char_width, CharRange};
 pub use core::str::{FromStr, from_str};
 pub use core::str::{Str, StrPrelude};
-pub use core::str::{from_utf8_unchecked, from_c_str};
 pub use unicode::str::{UnicodeStrPrelude, Words, Graphemes, GraphemeIndices};
 
 // FIXME(conventions): ensure bit/char conventions are followed by str's API
@@ -394,11 +392,11 @@ pub fn replace(s: &str, from: &str, to: &str) -> String {
     let mut result = String::new();
     let mut last_end = 0;
     for (start, end) in s.match_indices(from) {
-        result.push_str(unsafe { s.slice_unchecked(last_end, start) });
+        result.push_str(unsafe{raw::slice_bytes(s, last_end, start)});
         result.push_str(to);
         last_end = end;
     }
-    result.push_str(unsafe { s.slice_unchecked(last_end, s.len()) });
+    result.push_str(unsafe{raw::slice_bytes(s, last_end, s.len())});
     result
 }
 
@@ -631,9 +629,7 @@ pub trait StrAllocating: Str {
         let me = self.as_slice();
         let mut out = String::with_capacity(me.len());
         for c in me.chars() {
-            for c in c.escape_default() {
-                out.push(c);
-            }
+            c.escape_default(|c| out.push(c));
         }
         out
     }
@@ -643,9 +639,7 @@ pub trait StrAllocating: Str {
         let me = self.as_slice();
         let mut out = String::with_capacity(me.len());
         for c in me.chars() {
-            for c in c.escape_unicode() {
-                out.push(c);
-            }
+            c.escape_unicode(|c| out.push(c));
         }
         out
     }
@@ -675,7 +669,16 @@ pub trait StrAllocating: Str {
     /// assert_eq!(s.replace("cookie monster", "little lamb"), s);
     /// ```
     fn replace(&self, from: &str, to: &str) -> String {
-        replace(self.as_slice(), from, to)
+        let me = self.as_slice();
+        let mut result = String::new();
+        let mut last_end = 0;
+        for (start, end) in me.match_indices(from) {
+            result.push_str(unsafe{raw::slice_bytes(me, last_end, start)});
+            result.push_str(to);
+            last_end = end;
+        }
+        result.push_str(unsafe{raw::slice_bytes(me, last_end, me.len())});
+        result
     }
 
     /// Given a string, makes a new string with repeated copies of it.
@@ -1185,7 +1188,7 @@ mod tests {
         assert_eq!("11foo1bar11".trim_left_chars('1'), "foo1bar11");
         let chars: &[char] = &['1', '2'];
         assert_eq!("12foo1bar12".trim_left_chars(chars), "foo1bar12");
-        assert_eq!("123foo1bar123".trim_left_chars(|c: char| c.is_numeric()), "foo1bar123");
+        assert_eq!("123foo1bar123".trim_left_chars(|c: char| c.is_digit()), "foo1bar123");
     }
 
     #[test]
@@ -1200,7 +1203,7 @@ mod tests {
         assert_eq!("11foo1bar11".trim_right_chars('1'), "11foo1bar");
         let chars: &[char] = &['1', '2'];
         assert_eq!("12foo1bar12".trim_right_chars(chars), "12foo1bar");
-        assert_eq!("123foo1bar123".trim_right_chars(|c: char| c.is_numeric()), "123foo1bar");
+        assert_eq!("123foo1bar123".trim_right_chars(|c: char| c.is_digit()), "123foo1bar");
     }
 
     #[test]
@@ -1215,7 +1218,7 @@ mod tests {
         assert_eq!("11foo1bar11".trim_chars('1'), "foo1bar");
         let chars: &[char] = &['1', '2'];
         assert_eq!("12foo1bar12".trim_chars(chars), "foo1bar");
-        assert_eq!("123foo1bar123".trim_chars(|c: char| c.is_numeric()), "foo1bar");
+        assert_eq!("123foo1bar123".trim_chars(|c: char| c.is_digit()), "foo1bar");
     }
 
     #[test]