Remove use of return outside a routine

AlexDaniel · AlexDaniel · commit ce2fde35a5dd · 2019-07-31T20:08:48.000+03:00
After rakudo upgrade it now correctly says:

    Attempt to return outside of immediately-enclosing Routine

And I'm surprised it didn't cause any issues before.
diff --git a/lib/Whateverable/Replaceable.pm6 b/lib/Whateverable/Replaceable.pm6
@@ -35,10 +35,10 @@ method make-believe($msg, @nicks, &play, :$timeout = 4) {
     start {
         my %*BOT-ENV = $x; # TODO … yeah, I don't know
         await Promise.anyof: $update-promise, Promise.in: $timeout;
-        $!users-lock.protect: {
-            return if any %!users{$msg.channel}{@nicks}:exists
+        my @found-nicks = $!users-lock.protect: {
+             %!users{$msg.channel}{@nicks}:exists
         }
-        try {
+        if @found-nicks.none {
             $msg.reply: $_ but Reply($msg) with play;
             CATCH { default { $msg.reply: self.handle-exception: $_, $msg } }
         }

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ method make-believe($msg, @nicks, &play, :$timeout = 4) {`
`35`	`35`	`start {`
`36`	`36`	`my %*BOT-ENV = $x; # TODO … yeah, I don't know`
`37`	`37`	`await Promise.anyof: $update-promise, Promise.in: $timeout;`
`38`		`- $!users-lock.protect: {`
`39`		`- return if any %!users{$msg.channel}{@nicks}:exists`
	`38`	`+ my @found-nicks = $!users-lock.protect: {`
	`39`	`+ %!users{$msg.channel}{@nicks}:exists`
`40`	`40`	`}`
`41`		`- try {`
	`41`	`+ if @found-nicks.none {`
`42`	`42`	`$msg.reply: $_ but Reply($msg) with play;`
`43`	`43`	`CATCH { default { $msg.reply: self.handle-exception: $_, $msg } }`
`44`	`44`	`}`