From 373e87a74db2fd71e870376b743eaad4ed74d42a Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 14 Nov 2015 13:15:33 +0000 Subject: * ext/socket/lib/socket.rb: Specify frozen_string_literal: true. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/socket/lib/socket.rb | 4 +++- test/socket/test_addrinfo.rb | 2 ++ test/socket/test_ancdata.rb | 2 ++ test/socket/test_basicsocket.rb | 2 ++ test/socket/test_nonblock.rb | 4 +++- test/socket/test_socket.rb | 2 ++ test/socket/test_sockopt.rb | 2 ++ test/socket/test_tcp.rb | 2 ++ test/socket/test_udp.rb | 2 ++ test/socket/test_unix.rb | 4 +++- 11 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6be574db11..c92acecbd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 14 22:15:07 2015 Tanaka Akira + + * ext/socket/lib/socket.rb: Specify frozen_string_literal: true. + Sat Nov 14 21:44:56 2015 Tanaka Akira * lib/time.rb: Use "<<" to reduce string allocation. diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 7c66e8f730..d5f66bcd27 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'socket.so' require 'io/wait' @@ -747,7 +749,7 @@ class Socket < BasicSocket attr_reader :local_address def inspect # :nodoc: - "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>" + "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>".dup end # Sends the String +msg+ to the source diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb index b83118f5c7..a607a84172 100644 --- a/test/socket/test_addrinfo.rb +++ b/test/socket/test_addrinfo.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" rescue LoadError diff --git a/test/socket/test_ancdata.rb b/test/socket/test_ancdata.rb index 112b0c9e58..b2f86a0bb1 100644 --- a/test/socket/test_ancdata.rb +++ b/test/socket/test_ancdata.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test/unit' require 'socket' diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb index da977b3be0..227034ed26 100644 --- a/test/socket/test_basicsocket.rb +++ b/test/socket/test_basicsocket.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" require "test/unit" diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb index 55198ba4dd..3f8d548c5e 100644 --- a/test/socket/test_nonblock.rb +++ b/test/socket/test_nonblock.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" require "io/nonblock" @@ -129,7 +131,7 @@ class TestSocketNonblock < Test::Unit::TestCase mesg = u1.recv_nonblock(100) assert_equal("", mesg) - buf = "short" + buf = "short".dup out = "hello world" * 4 out.freeze u2.send(out, 0, u1.getsockname) diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 3682338b48..26684622e2 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" require "tmpdir" diff --git a/test/socket/test_sockopt.rb b/test/socket/test_sockopt.rb index 2ee06dbecd..0a2937e4fe 100644 --- a/test/socket/test_sockopt.rb +++ b/test/socket/test_sockopt.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'test/unit' require 'socket' diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb index 5e3528e242..c0e34ebe27 100644 --- a/test/socket/test_tcp.rb +++ b/test/socket/test_tcp.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" require "test/unit" diff --git a/test/socket/test_udp.rb b/test/socket/test_udp.rb index 56933375d7..5b23cce288 100644 --- a/test/socket/test_udp.rb +++ b/test/socket/test_udp.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" require "test/unit" diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 9ca97d2998..313a1f018b 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require "socket" rescue LoadError @@ -386,7 +388,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase assert_equal("", s1.recv(10)) assert_raise(IO::EAGAINWaitReadable) { s1.recv_nonblock(10) } - buf = "" + buf = "".dup s2.send("BBBBBB", 0) IO.select([s1]) rv = s1.recv(100, 0, buf) -- cgit v1.2.3