@@ -523,8 +523,8 @@ fn get_params(gen: &GeneratorContext,
523
523
let node = gen. node_map [ & node_id] ;
524
524
let parameters = node. get_parameters ( ) ?;
525
525
526
- for idx in 0 .. parameters. len ( ) {
527
- result. push ( parameters . get ( parameters . len ( ) - 1 - idx ) . get_name ( ) ?. into ( ) ) ;
526
+ for parameter in parameters. into_iter ( ) . rev ( ) {
527
+ result. push ( parameter . get_name ( ) ?. into ( ) ) ;
528
528
}
529
529
530
530
node_id = node. get_scope_id ( ) ;
@@ -1761,8 +1761,8 @@ fn generate_node(gen: &GeneratorContext,
1761
1761
let mut members = Vec :: new ( ) ;
1762
1762
let mut match_branches = Vec :: new ( ) ;
1763
1763
let enumerants = enum_reader. get_enumerants ( ) ?;
1764
- for ii in 0 .. enumerants. len ( ) {
1765
- let enumerant = capitalize_first_letter ( get_enumerant_name ( enumerants . get ( ii ) ) ?) ;
1764
+ for ( ii , enumerant ) in enumerants. into_iter ( ) . enumerate ( ) {
1765
+ let enumerant = capitalize_first_letter ( get_enumerant_name ( enumerant ) ?) ;
1766
1766
members. push ( Line ( format ! ( "{} = {}," , enumerant, ii) ) ) ;
1767
1767
match_branches. push (
1768
1768
Line ( format ! ( "{} => ::core::result::Result::Ok({}::{})," , ii, last_name, enumerant) ) ) ;
@@ -1828,8 +1828,7 @@ fn generate_node(gen: &GeneratorContext,
1828
1828
mod_interior. push ( Line ( "#![allow(unused_variables)]" . to_string ( ) ) ) ;
1829
1829
1830
1830
let methods = interface. get_methods ( ) ?;
1831
- for ordinal in 0 ..methods. len ( ) {
1832
- let method = methods. get ( ordinal) ;
1831
+ for ( ordinal, method) in methods. into_iter ( ) . enumerate ( ) {
1833
1832
let name = method. get_name ( ) ?;
1834
1833
1835
1834
method. get_code_order ( ) ;
@@ -1906,8 +1905,7 @@ fn generate_node(gen: &GeneratorContext,
1906
1905
gen : & GeneratorContext < ' a >
1907
1906
) -> :: capnp:: Result < ( ) > {
1908
1907
let extends = interface. get_superclasses ( ) ?;
1909
- for ii in 0 ..extends. len ( ) {
1910
- let superclass = extends. get ( ii) ;
1908
+ for superclass in extends {
1911
1909
if let node:: Interface ( interface) = gen. node_map [ & superclass. get_id ( ) ] . which ( ) ? {
1912
1910
find_super_interfaces ( interface, all_extends, gen) ?;
1913
1911
}
@@ -2157,9 +2155,9 @@ fn generate_node(gen: &GeneratorContext,
2157
2155
match node. which ( ) ? {
2158
2156
node:: Enum ( e) => {
2159
2157
let enumerants = e. get_enumerants ( ) ?;
2160
- if ( v as u32 ) < enumerants. len ( ) {
2158
+ if let Some ( enumerant ) = enumerants. try_get ( v as u32 ) {
2161
2159
let variant =
2162
- capitalize_first_letter ( get_enumerant_name ( enumerants . get ( v as u32 ) ) ?) ;
2160
+ capitalize_first_letter ( get_enumerant_name ( enumerant ) ?) ;
2163
2161
let type_string = typ. type_string ( gen, Leaf :: Owned ) ?;
2164
2162
Line ( format ! ( "pub const {}: {} = {}::{};" ,
2165
2163
styled_name,
0 commit comments