Merge pull request #86 from tokuhirom/re-workaround-for-rt-30535

Apply workaround of rt-30535
tokuhirom · Jan 17, 2017 · c9db88a · c9db88a
2 parents 4c5f9c1 + 6fd2072
commit c9db88a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/lib/Crust/Runner.pm6 b/lib/Crust/Runner.pm6
@@ -76,7 +76,9 @@ method !setup() {
     CompUnit::RepositoryRegistry.use-repository(CompUnit::RepositoryRegistry.repository-for-spec($_))
         for @!inc;
     for @!modules {
-        require ::($_)
+        # FIXME: workaround for Bug RT #130535
+        # ref: https://github.com/tokuhirom/p6-Crust/pull/86
+        EVAL "use $_";
     }
 }
 

diff --git a/lib/Crust/Test.pm6 b/lib/Crust/Test.pm6
@@ -9,9 +9,14 @@ $Impl ||= %*ENV<CRUST_TEST_IMPL> || "MockHTTP";
 # This is workaround for the issue. We should remove following line before christmas.
 use Crust::Test::MockHTTP;
 
+use MONKEY-SEE-NO-EVAL;
+
 method create(Crust::Test:U: Callable $app, *@args) {
     my $subclass = "Crust::Test::$Impl";
-    require ::($subclass);
+
+    # FIXME: workaround for Bug RT #130535
+    # ref: https://github.com/tokuhirom/p6-Crust/pull/86
+    EVAL "use $subclass";
 
     ::($subclass).new(:$app); # @args
 }

diff --git a/lib/Crust/Utils.pm6 b/lib/Crust/Utils.pm6
@@ -2,6 +2,8 @@ use v6;
 
 unit module Crust::Utils;
 
+use MONKEY-SEE-NO-EVAL;
+
 # internal use only. we'll change this file without notice.
 
 sub parse-header-line(Str $header) is export {
@@ -54,7 +56,9 @@ sub content-length($body) is export {
 }
 
 multi sub load-class($class) is export {
-    require ::($class);
+    # FIXME: workaround for Bug RT #130535
+    # ref: https://github.com/tokuhirom/p6-Crust/pull/86
+    EVAL "use $class";
     return $class;
 }