From e1da6e554bf9235f613f44baeb5496663a6c12df Mon Sep 17 00:00:00 2001
From: Patrick Thomson <patrickt@github.com>
Date: Mon, 23 Nov 2020 12:01:08 -0500
Subject: [PATCH] Remove fanciful nomenclature.

---
 cli/src/query.rs         |  8 ++++----
 cli/src/query_testing.rs | 10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cli/src/query.rs b/cli/src/query.rs
index bf67edf6..485fdb82 100644
--- a/cli/src/query.rs
+++ b/cli/src/query.rs
@@ -57,8 +57,8 @@ pub fn query_files_at_paths(
                 )?;
                 results.push(query_testing::CaptureInfo {
                     name: capture_name.to_string(),
-                    position: capture.node.start_position(),
-                    terminus: capture.node.end_position(),
+                    start: capture.node.start_position(),
+                    end: capture.node.end_position(),
                 });
             }
         } else {
@@ -85,8 +85,8 @@ pub fn query_files_at_paths(
                     }
                     results.push(query_testing::CaptureInfo {
                         name: capture_name.to_string(),
-                        position: capture.node.start_position(),
-                        terminus: capture.node.end_position(),
+                        start: capture.node.start_position(),
+                        end: capture.node.end_position(),
                     });
                 }
             }
diff --git a/cli/src/query_testing.rs b/cli/src/query_testing.rs
index 96ccf6b2..2a9a8c2d 100644
--- a/cli/src/query_testing.rs
+++ b/cli/src/query_testing.rs
@@ -12,8 +12,8 @@ lazy_static! {
 #[derive(Debug, Eq, PartialEq)]
 pub struct CaptureInfo {
     pub name: String,
-    pub position: Point,
-    pub terminus: Point,
+    pub start: Point,
+    pub end: Point,
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -136,16 +136,14 @@ pub fn assert_expected_captures(
     let pairs = parse_position_comments(parser, language, contents.as_bytes())?;
     for info in &infos {
         let found = pairs.iter().find(|p| {
-            p.position.row == info.position.row
-                && p.position >= info.position
-                && p.position < info.terminus
+            p.position.row == info.start.row && p.position >= info.start && p.position < info.end
         });
 
         if let Some(found) = found {
             if found.expected_capture_name != info.name && info.name != "name" {
                 Err(error::Error::new(format!(
                     "Assertion failed: at {}, found {}, expected {}",
-                    info.position, found.expected_capture_name, info.name
+                    info.start, found.expected_capture_name, info.name
                 )))?
             }
         }