From e03d5da8cd095f146756a172df47a0d2912ba6f3 Mon Sep 17 00:00:00 2001
From: Nick Rolfe <nickrolfe@github.com>
Date: Wed, 28 Oct 2020 12:14:54 +0000
Subject: [PATCH] Rename a field to avoid using raw identifiers

---
 generator/src/ql.rs     |  4 ++--
 generator/src/ql_gen.rs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/generator/src/ql.rs b/generator/src/ql.rs
index 0d0b70d47bd..d422cde9f3a 100644
--- a/generator/src/ql.rs
+++ b/generator/src/ql.rs
@@ -149,12 +149,12 @@ impl fmt::Display for Predicate {
 #[derive(Clone)]
 pub struct FormalParameter {
     pub name: String,
-    pub r#type: Type,
+    pub param_type: Type,
 }
 
 impl fmt::Display for FormalParameter {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} {}", self.r#type, self.name)
+        write!(f, "{} {}", self.param_type, self.name)
     }
 }
 
diff --git a/generator/src/ql_gen.rs b/generator/src/ql_gen.rs
index e7f62f1420b..f400052e90d 100644
--- a/generator/src/ql_gen.rs
+++ b/generator/src/ql_gen.rs
@@ -149,23 +149,23 @@ fn create_location_class() -> ql::Class {
         formal_parameters: vec![
             ql::FormalParameter {
                 name: "filePath".to_owned(),
-                r#type: ql::Type::String,
+                param_type: ql::Type::String,
             },
             ql::FormalParameter {
                 name: "startLine".to_owned(),
-                r#type: ql::Type::Int,
+                param_type: ql::Type::Int,
             },
             ql::FormalParameter {
                 name: "startColumn".to_owned(),
-                r#type: ql::Type::Int,
+                param_type: ql::Type::Int,
             },
             ql::FormalParameter {
                 name: "endLine".to_owned(),
-                r#type: ql::Type::Int,
+                param_type: ql::Type::Int,
             },
             ql::FormalParameter {
                 name: "endColumn".to_owned(),
-                r#type: ql::Type::Int,
+                param_type: ql::Type::Int,
             },
         ],
         body: ql::Expression::Pred(
@@ -412,7 +412,7 @@ fn create_field_getters(
                     return_type: Some(ql::Type::Normal(dbscheme_name_to_class_name(field_type))),
                     formal_parameters: vec![ql::FormalParameter {
                         name: "i".to_owned(),
-                        r#type: ql::Type::Int,
+                        param_type: ql::Type::Int,
                     }],
                     body: create_get_field_expr_for_table_storage(&field_table_name, "i"),
                 },