Merge pull request #1367 from google/clippy-8

Some clippy fixes.

Author: adetaylor

engine/src/conversion/analysis/depth_first.rs

@@ -105,7 +105,7 @@ mod test {
             QualifiedName::new_from_cpp_name("c"),
             vec![QualifiedName::new_from_cpp_name("a")],
         );
-        let api_list = vec![a, b, c];
+        let api_list = [a, b, c];
         let mut it = fields_and_bases_first(api_list.iter());
         assert_eq!(it.next().unwrap().0, QualifiedName::new_from_cpp_name("a"));
         assert_eq!(it.next().unwrap().0, QualifiedName::new_from_cpp_name("c"));

engine/src/conversion/error_reporter.rs

@@ -55,7 +55,7 @@ where
 /// Run some code which generates an API. Add that API, or if
 /// anything goes wrong, instead add a note of the problem in our
 /// output API such that users will see documentation for the problem.
-pub(crate) fn convert_apis<FF, SF, EF, TF, A, B: 'static>(
+pub(crate) fn convert_apis<FF, SF, EF, TF, A, B>(
     in_apis: ApiVec<A>,
     out_apis: &mut ApiVec<B>,
     mut func_conversion: FF,
@@ -64,7 +64,7 @@ pub(crate) fn convert_apis<FF, SF, EF, TF, A, B: 'static>(
     mut typedef_conversion: TF,
 ) where
     A: AnalysisPhase,
-    B: AnalysisPhase,
+    B: AnalysisPhase + 'static,
     FF: FnMut(
         ApiName,
         Box<FuncToConvert>,
@@ -205,14 +205,11 @@ fn api_or_error<T: AnalysisPhase + 'static>(
 /// a method). Add that API, or if
 /// anything goes wrong, instead add a note of the problem in our
 /// output API such that users will see documentation for the problem.
-pub(crate) fn convert_item_apis<F, A, B: 'static>(
-    in_apis: ApiVec<A>,
-    out_apis: &mut ApiVec<B>,
-    mut fun: F,
-) where
+pub(crate) fn convert_item_apis<F, A, B>(in_apis: ApiVec<A>, out_apis: &mut ApiVec<B>, mut fun: F)
+where
     F: FnMut(Api<A>) -> Result<Box<dyn Iterator<Item = Api<B>>>, ConvertErrorFromCpp>,
     A: AnalysisPhase,
-    B: AnalysisPhase,
+    B: AnalysisPhase + 'static,
 {
     out_apis.extend(in_apis.into_iter().flat_map(|api| {
         let fullname = api.name_info().clone();

engine/src/lib.rs

@@ -604,7 +604,8 @@ pub fn do_cxx_cpp_generation(
     cxxgen_header_name: String,
 ) -> Result<CppFilePair, cxx_gen::Error> {
     let mut opt = cxx_gen::Opt::default();
-    opt.cxx_impl_annotations = cpp_codegen_options.cxx_impl_annotations.clone();
+    opt.cxx_impl_annotations
+        .clone_from(&cpp_codegen_options.cxx_impl_annotations);
     let cxx_generated = cxx_gen::generate_header_and_cc(rs, &opt)?;
     Ok(CppFilePair {
         header: strip_system_headers(