Finish porting to Crystal 0.18

jhass · Jun 14, 2016 · e3da7b8 · e3da7b8
1 parent 49a4994
commit e3da7b8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 20 deletions.
diff --git a/bot/src/plugins/google.cr b/bot/src/plugins/google.cr
@@ -50,8 +50,8 @@ class Google
     resp = HTTP::Client.get(
       url,
       HTTP::Headers {
-        "User-Agent": "Lynx/2.8.7rel.2 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.0.0a",
-        "Accept-Language": "en"
+        "User-Agent" => "Lynx/2.8.7rel.2 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.0.0a",
+        "Accept-Language" => "en"
       }
     )
 

diff --git a/framework/src/framework/bot.cr b/framework/src/framework/bot.cr
@@ -17,8 +17,7 @@ module Framework
     getter    config
     getter!   connection : IRC::Connection
     property! user : User
-    delegate  channels, config
-    delegate  logger, config
+    delegate  channels, logger, to: config
 
     def self.create
       new.tap do |bot|

diff --git a/framework/src/framework/configuration.cr b/framework/src/framework/configuration.cr
@@ -119,8 +119,7 @@ module Framework
       end
 
       property! name : String
-      delegate listens_to?, channels!
-      delegate wants?, channels!
+      delegate listens_to?, wants?, to: channels!
 
       def channels!
         @channels ||= ChannelList.default

diff --git a/framework/src/framework/plugin_container.cr b/framework/src/framework/plugin_container.cr
@@ -8,8 +8,7 @@ module Framework
     include Workaround
 
     getter config : C?
-    delegate channels, config
-    delegate wants?, config
+    delegate channels, wants?, to: config
 
     def config
       (@config ||= T.config_class.empty).tap do |config|

diff --git a/framework/src/framework/user.cr b/framework/src/framework/user.cr
@@ -4,12 +4,7 @@ require "./bot"
 
 module Framework
   record User, irc_user : IRC::User, context : Bot do
-    delegate mask,     irc_user
-    delegate realname, irc_user
-    delegate nick,     irc_user
-    delegate user,     irc_user
-    delegate host,     irc_user
-    delegate modes,    irc_user
+    delegate mask, realname, nick, user, host, modes, to: irc_user
 
     def self.from_nick(nick : String, context : Bot)
       from_mask nick, context

diff --git a/irc/src/irc/connection.cr b/irc/src/irc/connection.cr
@@ -68,7 +68,7 @@ module IRC
     getter users
     getter channels
     getter network
-    delegate logger, config
+    delegate logger, to: config
 
     @workers : {Processor, Reader, Sender}?
 

diff --git a/irc/src/irc/user.cr b/irc/src/irc/user.cr
@@ -41,9 +41,7 @@ module IRC
     getter channels
     getter mask
     getter modes
-    delegate nick, mask
-    delegate user, mask
-    delegate host, mask
+    delegate nick, user, host, to: mask
 
     def initialize(@mask : Mask)
       @authname = nil

diff --git a/thread/src/thread/synchronized.cr b/thread/src/thread/synchronized.cr
@@ -3,9 +3,9 @@ class Synchronized(T)
     @mutex = Mutex.new
   end
 
-  macro method_missing(name, args, block)
+  macro method_missing(call)
     @mutex.synchronize do
-      @target.{{name.id}}({{*args}}) {{block}}
+      @target.{{call}}
     end
   end
 end