Touch up PR 67
diff --git a/gen/write.rs b/gen/write.rs
index e89cf0b..911a3d2 100644
--- a/gen/write.rs
+++ b/gen/write.rs
@@ -1031,7 +1031,7 @@
writeln!(
out,
" return cxxbridge02$rust_vec${}$drop(this);",
- instance
+ instance,
);
writeln!(out, "}}");
@@ -1044,7 +1044,7 @@
writeln!(
out,
"Vec<{}>::operator ::std::vector<{}>() const noexcept {{",
- inner, inner
+ inner, inner,
);
writeln!(out, " ::std::vector<{}> v;", inner);
writeln!(out, " v.reserve(this->size());");
diff --git a/macro/src/expand.rs b/macro/src/expand.rs
index 95a6f1a..1d40419 100644
--- a/macro/src/expand.rs
+++ b/macro/src/expand.rs
@@ -602,6 +602,7 @@
unsafe extern "C" fn #local_vector_from(this: *mut ::cxx::RustVec<#inner>, vector: *mut ::cxx::RealVector<#inner>) {
this.as_ref().unwrap().into_vector(vector.as_mut().unwrap());
}
+ #[doc(hidden)]
#[export_name = #link_len]
unsafe extern "C" fn #local_len(this: *const ::cxx::RustVec<#inner>) -> usize {
this.as_ref().unwrap().len()
diff --git a/src/vector.rs b/src/vector.rs
index 805bdbb..1436165 100644
--- a/src/vector.rs
+++ b/src/vector.rs
@@ -71,6 +71,7 @@
impl<'a, T: VectorTarget<T>> Iterator for VectorIntoIterator<'a, T> {
type Item = &'a T;
+
fn next(&mut self) -> Option<Self::Item> {
self.index = self.index + 1;
self.v.get(self.index - 1)
diff --git a/tests/ffi/tests.cc b/tests/ffi/tests.cc
index 1dd3b73..46f04be 100644
--- a/tests/ffi/tests.cc
+++ b/tests/ffi/tests.cc
@@ -59,29 +59,28 @@
}
std::unique_ptr<std::vector<uint8_t>> c_return_unique_ptr_vector_u8() {
- auto retval =
- std::unique_ptr<std::vector<uint8_t>>(new std::vector<uint8_t>());
- retval->push_back(86);
- retval->push_back(75);
- retval->push_back(30);
- retval->push_back(9);
- return retval;
+ auto vec = std::unique_ptr<std::vector<uint8_t>>(new std::vector<uint8_t>());
+ vec->push_back(86);
+ vec->push_back(75);
+ vec->push_back(30);
+ vec->push_back(9);
+ return vec;
}
std::unique_ptr<std::vector<double>> c_return_unique_ptr_vector_f64() {
- auto retval = std::unique_ptr<std::vector<double>>(new std::vector<double>());
- retval->push_back(86.0);
- retval->push_back(75.0);
- retval->push_back(30.0);
- retval->push_back(9.5);
- return retval;
+ auto vec = std::unique_ptr<std::vector<double>>(new std::vector<double>());
+ vec->push_back(86.0);
+ vec->push_back(75.0);
+ vec->push_back(30.0);
+ vec->push_back(9.5);
+ return vec;
}
std::unique_ptr<std::vector<Shared>> c_return_unique_ptr_vector_shared() {
- auto retval = std::unique_ptr<std::vector<Shared>>(new std::vector<Shared>());
- retval->push_back(Shared{1010});
- retval->push_back(Shared{1011});
- return retval;
+ auto vec = std::unique_ptr<std::vector<Shared>>(new std::vector<Shared>());
+ vec->push_back(Shared{1010});
+ vec->push_back(Shared{1011});
+ return vec;
}
void c_take_primitive(size_t n) {