address review comments

Author: pvdrz

src/codegen/mod.rs

@@ -51,6 +51,7 @@ use quote::TokenStreamExt;
 use crate::{Entry, HashMap, HashSet};
 use std::borrow::Cow;
 use std::cell::Cell;
+use std::collections::BTreeMap;
 use std::collections::VecDeque;
 use std::fmt::Write;
 use std::iter;
@@ -246,7 +247,7 @@ struct CodegenResult<'a> {
     /// that name. This lets us give each overload a unique suffix.
     overload_counters: HashMap<String, u32>,
 
-    variadic_methods: HashMap<Ident, VariadicMethodInfo>,
+    variadic_methods: BTreeMap<Ident, VariadicMethodInfo>,
 }
 
 impl<'a> CodegenResult<'a> {
@@ -2513,7 +2514,7 @@ impl MethodCodegen for Method {
         let mut ret = utils::fnsig_return_ty(ctx, signature);
         let is_variadic = signature.is_variadic();
 
-        if is_variadic & ctx.options().tuple_varargs_len.is_none() {
+        if is_variadic && ctx.options().tuple_varargs_len.is_none() {
             return;
         }
 
@@ -5082,9 +5083,8 @@ pub mod utils {
         // This will hold the methods to be declared in the `VarArgs` trait as well as the
         // bodies of the implementations of such methods for each tuple length.
         let (trait_method_decls, trait_method_impl_fns): (Vec<_>, Vec<_>) =
-            result
-                .variadic_methods
-                .drain()
+            std::mem::take(&mut result.variadic_methods)
+                .into_iter()
                 .map(|(name, info)| {
                     let super::VariadicMethodInfo { args, ret, exprs } = info;