Auto merge of #57760 - dlrobertson:varargs1, r=alexreg

[rust.git] / src / librustc / ty / relate.rs

diff --git a/src/librustc/ty/relate.rs b/src/librustc/ty/relate.rs
index b15aa8629016641cc7b68b5022953e847ea37c2f..2940757fa905be45e68db9baa12418123ca595c8 100644 (file)
--- a/src/librustc/ty/relate.rs
+++ b/src/librustc/ty/relate.rs
@@ -147,9 +147,9 @@ fn relate<'a, 'gcx, R>(relation: &mut R,
     {
         let tcx = relation.tcx();
 
-        if a.variadic != b.variadic {
+        if a.c_variadic != b.c_variadic {
             return Err(TypeError::VariadicMismatch(
-                expected_found(relation, &a.variadic, &b.variadic)));
+                expected_found(relation, &a.c_variadic, &b.c_variadic)));
         }
         let unsafety = relation.relate(&a.unsafety, &b.unsafety)?;
         let abi = relation.relate(&a.abi, &b.abi)?;
@@ -171,7 +171,7 @@ fn relate<'a, 'gcx, R>(relation: &mut R,
             });
         Ok(ty::FnSig {
             inputs_and_output: tcx.mk_type_list(inputs_and_output)?,
-            variadic: a.variadic,
+            c_variadic: a.c_variadic,
             unsafety,
             abi,
         })