Fix the matches_pattern! macro.

The last release included a change which redirected matches_pattern! to matches_pattern_internal!. It did not fix the references inside the macros themselves to use $crate::matches_pattern_internal!. This worked fine in contexts where matches_pattern_internal! was already imported, but does not work in general client code where it is not. This change adds the $crate qualifier to each invocation of matches_pattern_internal!.

This also moves the tests of matches_pattern! out of the module and into a new integration test (see https://doc.rust-lang.org/rust-by-example/testing/integration_testing.html). This causes the tests to be compiled from outside the crate itself, precluding this type of bug in the future.

Fixes #86

Author: hovinen

googletest/src/matchers/matches_pattern.rs

@@ -132,7 +132,7 @@ macro_rules! matches_pattern_internal {
         [$($struct_name:tt)*],
         { $field_name:ident : $matcher:expr, $($rest:tt)* }
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(field!($($struct_name)*.$field_name, $matcher)),
             [$($struct_name)*],
             { $($rest)* }
@@ -155,7 +155,7 @@ macro_rules! matches_pattern_internal {
         [$($struct_name:tt)*],
         { $field_name:ident : $matcher:expr, $($rest:tt)* }
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.$field_name, $matcher)
@@ -187,7 +187,7 @@ macro_rules! matches_pattern_internal {
         [$($struct_name:tt)*],
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 field!($($struct_name)*.0, $matcher)
             ),
@@ -218,7 +218,7 @@ macro_rules! matches_pattern_internal {
         1,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.1, $matcher)
@@ -235,7 +235,7 @@ macro_rules! matches_pattern_internal {
         2,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.2, $matcher)
@@ -252,7 +252,7 @@ macro_rules! matches_pattern_internal {
         3,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.3, $matcher)
@@ -269,7 +269,7 @@ macro_rules! matches_pattern_internal {
         4,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.4, $matcher)
@@ -286,7 +286,7 @@ macro_rules! matches_pattern_internal {
         5,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.5, $matcher)
@@ -303,7 +303,7 @@ macro_rules! matches_pattern_internal {
         6,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.6, $matcher)
@@ -320,7 +320,7 @@ macro_rules! matches_pattern_internal {
         7,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.7, $matcher)
@@ -337,7 +337,7 @@ macro_rules! matches_pattern_internal {
         8,
         ($matcher:expr, $($rest:tt)*)
     ) => {
-        matches_pattern_internal!(
+        $crate::matches_pattern_internal!(
             all!(
                 $($processed)*,
                 field!($($struct_name)*.8, $matcher)
@@ -349,7 +349,7 @@ macro_rules! matches_pattern_internal {
     };
 
     ([$($struct_name:tt)*], $first:tt $($rest:tt)*) => {
-        matches_pattern_internal!([$($struct_name)* $first], $($rest)*)
+        $crate::matches_pattern_internal!([$($struct_name)* $first], $($rest)*)
     };
 
     ($first:tt $($rest:tt)*) => {{
@@ -362,14 +362,14 @@ macro_rules! matches_pattern_internal {
         #[cfg(google3)]
         #[allow(unused)]
         use field_matcher::field;
-        matches_pattern_internal!([$first], $($rest)*)
+        $crate::matches_pattern_internal!([$first], $($rest)*)
     }};
 }
 
 /// An alias for [`matches_pattern`].
 #[macro_export]
 macro_rules! pat {
-    ($($t:tt)*) => { matches_pattern_internal!($($t)*) }
+    ($($t:tt)*) => { $crate::matches_pattern_internal!($($t)*) }
 }
 
 #[cfg(test)]

googletest/tests/lib.rs

@@ -0,0 +1,15 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod matches_pattern_test;