Partial update to Rust 1.0 beta

Not a full update because a rustc ICE is blocking further progress.
Valloric · Apr 5, 2015 · fd59694 · fd59694
1 parent d4c9861
commit fd59694
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base/char_class.rs b/base/char_class.rs
@@ -16,7 +16,6 @@ use super::{Expression, ParseState, ParseResult};
 
 macro_rules! class( ( $ex:expr ) => ( {
       use base;
-      use std::str::StrExt;
       &base::CharClass::new( $ex.as_bytes() ) } ) );
 
 

diff --git a/base/literal.rs b/base/literal.rs
@@ -15,7 +15,6 @@ use super::{Expression, ParseState, ParseResult};
 
 macro_rules! lit( ( $ex:expr ) => ( {
       use base;
-      use std::str::StrExt;
       &base::Literal::new( $ex.as_bytes() ) } ) );
 
 

diff --git a/base/mod.rs b/base/mod.rs
@@ -111,4 +111,4 @@ pub trait Expression {
       -> Option< ParseResult<'a> >;
 }
 
-type Rule = for<'a> fn( &ParseState<'a> ) -> Option< ParseResult<'a> >;
+pub type Rule = for<'a> fn( &ParseState<'a> ) -> Option< ParseResult<'a> >;
diff --git a/base/node.rs b/base/node.rs
@@ -77,7 +77,7 @@ pub struct Node<'a> {
 
 fn indent( formatter: &mut fmt::Formatter, indent_spaces: u32 )
     -> fmt::Result {
-  for _ in range( 0, indent_spaces ) {
+  for _ in 0 .. indent_spaces {
     try!( write!( formatter, " " ) )
   }
   Ok(())
@@ -184,7 +184,7 @@ impl<'a> Node<'a> {
       Children( ref children ) => {
         let mut out : Vec<u8> = vec!();
         for child in children.iter() {
-          out.push_all( &child.matchedData() );
+          out.extend( child.matchedData() );
         }
         out
       }
@@ -242,8 +242,8 @@ mod tests {
   fn preOrder_FullIteration() {
     let root = testTree();
     let names =
-      root.preOrder().map( |x| x.name.char_at( 0 ) ).collect::<Vec<_>>();
-    assert_eq!( names, vec!( 'a', 'b', 'e', 'f', 'c', 'g', 'd' ) )
+      root.preOrder().map( |x| x.name ).collect::<Vec<_>>();
+    assert_eq!( names, vec!( "a", "b", "e", "f", "c", "g", "d" ) )
   }
 
 

diff --git a/base/test_utils.rs b/base/test_utils.rs
@@ -19,6 +19,5 @@ pub fn ToParseState<'a>( bytes: &'a [u8] ) -> ParseState<'a> {
 
 macro_rules! input_state( ( $ex:expr ) => ( {
       use base::ParseState;
-      use std::str::StrExt;
       ParseState { input: $ex.as_bytes(), offset: 0 }
     } ) );
diff --git a/base/unicode.rs b/base/unicode.rs
@@ -47,7 +47,7 @@ pub fn readCodepoint( input: &[u8] ) -> Option< char > {
         Some( num_following ) => {
           let mut codepoint: u32 =
             codepointBitsFromLeadingByte( *first_byte ) << 6 * num_following;
-          for i in range( 1, num_following + 1 ) {
+          for i in 1 .. num_following + 1 {
             match input.get( i ) {
               Some( byte ) if isContinuationByte( *byte ) => {
                 codepoint |= codepointBitsFromContinuationByte( *byte ) <<

diff --git a/inlined_parser.rs b/inlined_parser.rs
@@ -220,7 +220,6 @@ mod base {
 
     macro_rules! input_state( ( $ex:expr ) => ( {
           use base::ParseState;
-          use std::str::StrExt;
           ParseState { input: $ex.as_bytes(), offset: 0 }
         } ) );
   }
@@ -231,7 +230,6 @@ mod base {
 
     macro_rules! lit( ( $ex:expr ) => ( {
           use base;
-          use std::str::StrExt;
           &base::Literal::new( $ex.as_bytes() ) } ) );
 
 
@@ -266,7 +264,6 @@ mod base {
 
     macro_rules! class( ( $ex:expr ) => ( {
           use base;
-          use std::str::StrExt;
           &base::CharClass::new( $ex.as_bytes() ) } ) );
 
 

diff --git a/parser.rs b/parser.rs
@@ -11,8 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#![feature(core)]
-#![feature(collections)]
 #![allow(non_snake_case)]
 #![deny(deprecated)]
 
@@ -111,7 +109,6 @@ mod rules {
         {
           use base::ParseResult;
           use std::option::Option::Some;
-          use std::slice::SliceExt;
 
           match $name( &input_state!( $input ) ) {
             Some( ParseResult{ nodes: _, parse_state } ) => {
@@ -247,4 +244,4 @@ mod rules {
       assert!( !matches!( EndOfFile, "a" ) );
     }
   }
-}
+}
diff --git a/prelude.rs b/prelude.rs
@@ -234,7 +234,6 @@ mod base {
 
     macro_rules! input_state( ( $ex:expr ) => ( {
           use base::ParseState;
-          use std::str::StrExt;
           ParseState { input: $ex.as_bytes(), offset: 0 }
         } ) );
   }
@@ -245,7 +244,6 @@ mod base {
 
     macro_rules! lit( ( $ex:expr ) => ( {
           use base;
-          use std::str::StrExt;
           &base::Literal::new( $ex.as_bytes() ) } ) );
 
 
@@ -280,7 +278,6 @@ mod base {
 
     macro_rules! class( ( $ex:expr ) => ( {
           use base;
-          use std::str::StrExt;
           &base::CharClass::new( $ex.as_bytes() ) } ) );