commit 4cefa728e050bf342550997450c8564bddb16975
author David Tolnay <dtolnay@gmail.com> Sat Oct 03 21:24:07 2020 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Oct 03 21:24:07 2020 -0700
tree 10ea212d2dbe35e59db14c6bca9597a1d2663729
parent 599fad85bf78d3b3421a4d8f833e618932afd1ca

Consistently use ety for extern type variables

syntax/check.rs

diff --git a/syntax/check.rs b/syntax/check.rs
index 4960111..f256948 100644
--- a/syntax/check.rs
+++ b/syntax/check.rs
@@ -46,7 +46,7 @@
         match api {
             Api::Struct(strct) => check_api_struct(cx, strct),
             Api::Enum(enm) => check_api_enum(cx, enm),
-            Api::CxxType(ty) | Api::RustType(ty) => check_api_type(cx, ty),
+            Api::CxxType(ety) | Api::RustType(ety) => check_api_type(cx, ety),
             Api::CxxFunction(efn) | Api::RustFunction(efn) => check_api_fn(cx, efn),
             _ => {}
         }
@@ -207,10 +207,10 @@
     }
 }
 
-fn check_api_type(cx: &mut Check, ty: &ExternType) {
-    check_reserved_name(cx, &ty.ident);
+fn check_api_type(cx: &mut Check, ety: &ExternType) {
+    check_reserved_name(cx, &ety.ident);
 
-    if let Some(reason) = cx.types.required_trivial.get(&ty.ident) {
+    if let Some(reason) = cx.types.required_trivial.get(&ety.ident) {
         let what = match reason {
             TrivialReason::StructField(strct) => format!("a field of `{}`", strct.ident),
             TrivialReason::FunctionArgument(efn) => format!("an argument of `{}`", efn.ident),
@@ -220,7 +220,7 @@
             "needs a cxx::ExternType impl in order to be used as {}",
             what,
         );
-        cx.error(ty, msg);
+        cx.error(ety, msg);
     }
 }
 

syntax/parse.rs

diff --git a/syntax/parse.rs b/syntax/parse.rs
index c1c565f..cec818d 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -221,7 +221,7 @@
     }
 
     let mut types = items.iter().filter_map(|item| match item {
-        Api::CxxType(ty) | Api::RustType(ty) => Some(&ty.ident),
+        Api::CxxType(ety) | Api::RustType(ety) => Some(&ety.ident),
         Api::TypeAlias(alias) => Some(&alias.ident),
         _ => None,
     });