From 42b8fe471f9305de591fe834af1be554265a388a Mon Sep 17 00:00:00 2001
From: Michael Miller <icy.arctic.fox@gmail.com>
Date: Thu, 1 Aug 2019 16:37:19 -0600
Subject: [PATCH] Fix some includes and a dangling old file

---
 src/spectator/expectations/expectation.cr         |  2 +-
 src/spectator/matchers/failed_match_data.cr       |  2 +-
 .../matchers/match_data_labeled_value.cr          | 15 ---------------
 src/spectator/matchers/matcher.cr                 |  4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 src/spectator/matchers/match_data_labeled_value.cr

diff --git a/src/spectator/expectations/expectation.cr b/src/spectator/expectations/expectation.cr
index 1f787dc..63e48cb 100644
--- a/src/spectator/expectations/expectation.cr
+++ b/src/spectator/expectations/expectation.cr
@@ -1,4 +1,4 @@
-require "../matchers/failed_matched_data"
+require "../matchers/failed_match_data"
 require "../matchers/match_data"
 require "../source"
 
diff --git a/src/spectator/matchers/failed_match_data.cr b/src/spectator/matchers/failed_match_data.cr
index 5855de5..250cf64 100644
--- a/src/spectator/matchers/failed_match_data.cr
+++ b/src/spectator/matchers/failed_match_data.cr
@@ -1,4 +1,4 @@
-require "./labeled_value"
+require "../test_value"
 require "./match_data"
 
 module Spectator::Matchers
diff --git a/src/spectator/matchers/match_data_labeled_value.cr b/src/spectator/matchers/match_data_labeled_value.cr
deleted file mode 100644
index 2a39095..0000000
--- a/src/spectator/matchers/match_data_labeled_value.cr
+++ /dev/null
@@ -1,15 +0,0 @@
-module Spectator::Matchers
-  # A value from match data with a label.
-  struct MatchDataLabeledValue
-    # Label tied to the value.
-    # This annotates what the value is.
-    getter label : Symbol
-
-    # The actual value from the match data.
-    getter value : MatchDataValue
-
-    # Creates a new labeled value.
-    def initialize(@label, @value)
-    end
-  end
-end
diff --git a/src/spectator/matchers/matcher.cr b/src/spectator/matchers/matcher.cr
index e9d57bc..d87d8ca 100644
--- a/src/spectator/matchers/matcher.cr
+++ b/src/spectator/matchers/matcher.cr
@@ -1,6 +1,6 @@
-require "./failed_matched_data"
+require "../test_value"
+require "./failed_match_data"
 require "./successful_match_data"
-require "./test_value"
 
 module Spectator::Matchers
   # Common base class for all expectation conditions.