BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-08 14:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Add idiomatic iterator for Vector type (#5579)

Browse Source 
* Rust: Add idiomatic iterator for Vector type

* Add comments explaining some implementation details
This commit is contained in:
Mathias Svensson
2019-10-28 19:19:47 +01:00
committed by Robert Winslow
parent 1b85292fd3
commit 521e255ad9
2 changed files with 204 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
tests/rust_usage_test/tests/integration_test.rs
View File

@@ -184,6 +184,7 @@ fn serialized_example_is_accessible_and_correct(bytes: &[u8], identifier_require
let inv = m.inventory().unwrap();
check_eq!(inv.len(), 5)?;
check_eq!(inv.iter().sum::<u8>(), 10u8)?;
check_eq!(inv.iter().rev().sum::<u8>(), 10u8)?;
check_is_some!(m.test4())?;
let test4 = m.test4().unwrap();
@@ -509,6 +510,18 @@ mod roundtrip_generated_code {
assert_eq!(m.testarrayofstring().unwrap().len(), 2);
assert_eq!(m.testarrayofstring().unwrap().get(0), "foobar");
assert_eq!(m.testarrayofstring().unwrap().get(1), "baz");
let rust_vec_inst = m.testarrayofstring().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect.len(), 2);
assert_eq!(rust_vec_iter_collect[0], "foobar");
assert_eq!(rust_vec_iter_collect[1], "baz");
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect.len(), 2);
assert_eq!(rust_vec_iter_rev_collect[1], "foobar");
assert_eq!(rust_vec_iter_rev_collect[0], "baz");
}
#[test]
fn vector_of_string_store_manual_build() {
@@ -523,6 +536,17 @@ mod roundtrip_generated_code {
assert_eq!(m.testarrayofstring().unwrap().len(), 2);
assert_eq!(m.testarrayofstring().unwrap().get(0), "foobar");
assert_eq!(m.testarrayofstring().unwrap().get(1), "baz");
let rust_vec_inst = m.testarrayofstring().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect.len(), 2);
assert_eq!(rust_vec_iter_collect[0], "foobar");
assert_eq!(rust_vec_iter_collect[1], "baz");
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect.len(), 2);
assert_eq!(rust_vec_iter_rev_collect[0], "baz");
assert_eq!(rust_vec_iter_rev_collect[1], "foobar");
}
#[test]
fn vector_of_ubyte_store() {
@@ -543,6 +567,13 @@ mod roundtrip_generated_code {
name: Some(name),
testarrayofbools: Some(v), ..Default::default()});
assert_eq!(m.testarrayofbools().unwrap(), &[false, true, false, true][..]);
let rust_vec_inst = m.testarrayofbools().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect, &[&false, &true, &false, &true][..]);
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect, &[&true, &false, &true, &false][..]);
}
#[test]
fn vector_of_f64_store() {
@@ -554,6 +585,15 @@ mod roundtrip_generated_code {
vector_of_doubles: Some(v), ..Default::default()});
assert_eq!(m.vector_of_doubles().unwrap().len(), 1);
assert_eq!(m.vector_of_doubles().unwrap().get(0), 3.14159265359f64);
let rust_vec_inst = m.vector_of_doubles().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect.len(), 1);
assert_eq!(rust_vec_iter_collect[0], 3.14159265359f64);
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect.len(), 1);
assert_eq!(rust_vec_iter_rev_collect[0], 3.14159265359f64);
}
#[test]
fn vector_of_struct_store() {
@@ -564,6 +604,13 @@ mod roundtrip_generated_code {
name: Some(name),
test4: Some(v), ..Default::default()});
assert_eq!(m.test4().unwrap(), &[my_game::example::Test::new(127, -128), my_game::example::Test::new(3, 123)][..]);
let rust_vec_inst = m.test4().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect, &[&my_game::example::Test::new(127, -128), &my_game::example::Test::new(3, 123)][..]);
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect, &[&my_game::example::Test::new(3, 123), &my_game::example::Test::new(127, -128)][..]);
}
#[test]
fn vector_of_struct_store_with_type_inference() {
@@ -613,6 +660,21 @@ mod roundtrip_generated_code {
assert_eq!(m.testarrayoftables().unwrap().get(0).name(), "foo");
assert_eq!(m.testarrayoftables().unwrap().get(1).hp(), 100);
assert_eq!(m.testarrayoftables().unwrap().get(1).name(), "bar");
let rust_vec_inst = m.testarrayoftables().unwrap();
let rust_vec_iter_collect = rust_vec_inst.iter().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_collect.len(), 2);
assert_eq!(rust_vec_iter_collect[0].hp(), 55);
assert_eq!(rust_vec_iter_collect[0].name(), "foo");
assert_eq!(rust_vec_iter_collect[1].hp(), 100);
assert_eq!(rust_vec_iter_collect[1].name(), "bar");
let rust_vec_iter_rev_collect = rust_vec_inst.iter().rev().collect::<Vec<_>>();
assert_eq!(rust_vec_iter_rev_collect.len(), 2);
assert_eq!(rust_vec_iter_rev_collect[0].hp(), 100);
assert_eq!(rust_vec_iter_rev_collect[0].name(), "bar");
assert_eq!(rust_vec_iter_rev_collect[1].hp(), 55);
assert_eq!(rust_vec_iter_rev_collect[1].name(), "foo");
}
}
@@ -721,6 +783,12 @@ mod generated_code_alignment_and_padding {
let aln = ::std::mem::align_of::<my_game::example::Ability>();
assert_eq!((a_ptr - start_ptr) % aln, 0);
}
for a in abilities.iter().rev() {
let a_ptr = a as *const my_game::example::Ability as usize;
assert!(a_ptr > start_ptr);
let aln = ::std::mem::align_of::<my_game::example::Ability>();
assert_eq!((a_ptr - start_ptr) % aln, 0);
}
}
}
@@ -806,6 +874,13 @@ mod roundtrip_vectors {
result_vec.push(got.get(i));
}
assert_eq!(result_vec, xs);
let rust_vec_iter = got.iter().collect::<Vec<T>>();
assert_eq!(rust_vec_iter, xs);
let mut rust_vec_rev_iter = got.iter().rev().collect::<Vec<T>>();
rust_vec_rev_iter.reverse();
assert_eq!(rust_vec_rev_iter, xs);
}
#[test]