Enable RuboCop Style/UnpackFirst

lib/rb/.rubocop.yml

@@ -250,3 +250,6 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: comma
+
+Style/UnpackFirst:
+  Enabled: true

lib/rb/lib/thrift/protocol/binary_protocol.rb

@@ -214,7 +214,7 @@ def read_byte
 
     def read_i16
       trans.read_into_buffer(@rbuf, 2)
-      val, = @rbuf.unpack("n")
+      val = @rbuf.unpack1("n")
       if (val > 0x7fff)
         val = 0 - ((val - 1) ^ 0xffff)
       end
@@ -223,7 +223,7 @@ def read_i16
 
     def read_i32
       trans.read_into_buffer(@rbuf, 4)
-      val, = @rbuf.unpack("N")
+      val = @rbuf.unpack1("N")
       if (val > 0x7fffffff)
         val = 0 - ((val - 1) ^ 0xffffffff)
       end
@@ -244,7 +244,7 @@ def read_i64
 
     def read_double
       trans.read_into_buffer(@rbuf, 8)
-      val = @rbuf.unpack("G").first
+      val = @rbuf.unpack1("G")
       val
     end
 

lib/rb/lib/thrift/protocol/compact_protocol.rb

@@ -20,7 +20,7 @@
 
 module Thrift
   class CompactProtocol < BaseProtocol
-    PROTOCOL_ID = [0x82].pack("c").unpack("c").first
+    PROTOCOL_ID = [0x82].pack("c").unpack1("c")
     VERSION = 1
     VERSION_MASK = 0x1f
     TYPE_MASK = 0xE0
@@ -410,7 +410,7 @@ def read_i64
 
     def read_double
       trans.read_into_buffer(@rbuf, 8)
-      val = @rbuf.reverse.unpack("G").first
+      val = @rbuf.reverse.unpack1("G")
       val
     end
 

lib/rb/lib/thrift/server/nonblocking_server.rb

@@ -279,7 +279,7 @@ def close_signal_pipes
 
       def slice_frame!(buf)
         if buf.length >= 4
-          size = buf.unpack("N").first
+          size = buf.unpack1("N")
           if buf.length >= size + 4
             buf.slice!(0, size + 4)
           else

lib/rb/lib/thrift/struct_union.rb

@@ -188,7 +188,7 @@ def inspect_field(value, field_info)
       elsif value.is_a? Set
         inspect_collection(value, field_info)
       elsif value.is_a?(String) && field_info[:binary]
-        value.unpack("H*").first
+        value.unpack1("H*")
       else
         value.inspect
       end

lib/rb/lib/thrift/transport/framed_transport.rb

@@ -107,7 +107,7 @@ def to_s
     private
 
     def read_frame
-      sz = @transport.read_all(4).unpack("N").first
+      sz = @transport.read_all(4).unpack1("N")
 
       @index = 0
       @rbuf = @transport.read_all(sz)

lib/rb/lib/thrift/transport/header_transport.rb

@@ -285,7 +285,7 @@ def read_frame(req_sz)
       rescue EOFError
         raise TransportException.new(TransportException::END_OF_FILE, "Unexpected EOF reading frame size")
       end
-      frame_size = first_word.unpack("N").first
+      frame_size = first_word.unpack1("N")
 
       # Check for unframed binary protocol
       if (frame_size & BINARY_VERSION_MASK) == BINARY_VERSION_1
@@ -324,15 +324,15 @@ def read_frame(req_sz)
       second_word = frame_buf.read(4)
       frame_buf.rewind
 
-      magic = second_word.unpack("n").first
+      magic = second_word.unpack1("n")
 
       if magic == HEADER_MAGIC
         if frame_size < 10
           raise TransportException.new(TransportException::UNKNOWN, "Header transport frame is too small")
         end
         set_client_type(HeaderClientType::HEADERS)
         @read_buffer = parse_header_format(frame_buf)
-      elsif (second_word.unpack("N").first & BINARY_VERSION_MASK) == BINARY_VERSION_1
+      elsif (second_word.unpack1("N") & BINARY_VERSION_MASK) == BINARY_VERSION_1
         set_client_type(HeaderClientType::FRAMED_BINARY)
         @protocol_id = HeaderSubprotocolID::BINARY
         @read_buffer = frame_buf
@@ -382,11 +382,11 @@ def parse_header_format(buf)
       buf.read(2)
 
       # Read flags and sequence ID
-      @flags = buf.read(2).unpack("n").first
-      @sequence_id = signed_int32(buf.read(4).unpack("N").first)
+      @flags = buf.read(2).unpack1("n")
+      @sequence_id = signed_int32(buf.read(4).unpack1("N"))
 
       # Read header length (in 32-bit words)
-      header_words = buf.read(2).unpack("n").first
+      header_words = buf.read(2).unpack1("n")
       if header_words >= 16_384
         raise TransportException.new(TransportException::UNKNOWN, "Header size is unreasonable")
       end

lib/rb/lib/thrift/uuid.rb

@@ -43,7 +43,7 @@ def self.uuid_from_bytes(bytes)
         raise ProtocolException.new(ProtocolException::INVALID_DATA, "Invalid UUID data length")
       end
 
-      hex = bytes.unpack("H*").first
+      hex = bytes.unpack1("H*")
       "#{hex[0, 8]}-#{hex[8, 4]}-#{hex[12, 4]}-#{hex[16, 4]}-#{hex[20, 12]}"
     end
   end

lib/rb/spec/header_protocol_spec.rb

@@ -116,7 +116,7 @@
         @protocol.trans.flush
 
         data = @buffer.read(@buffer.available)
-        expect(data[8, 4].unpack("N").first).to eq(123)
+        expect(data[8, 4].unpack1("N")).to eq(123)
       end
 
       it "should write and read structs" do

lib/rb/spec/header_transport_spec.rb

@@ -151,11 +151,11 @@ def read_unframed_message(protocol)
         expect(data.bytesize).to be > 16
 
         # First 4 bytes are frame length
-        frame_size = data[0, 4].unpack("N").first
+        frame_size = data[0, 4].unpack1("N")
         expect(frame_size).to eq(data.bytesize - 4)
 
         # Next 2 bytes should be header magic
-        magic = data[4, 2].unpack("n").first
+        magic = data[4, 2].unpack1("n")
         expect(magic).to eq(Thrift::HeaderTransport::HEADER_MAGIC)
       end
 
@@ -175,7 +175,7 @@ def read_unframed_message(protocol)
         @trans.flush
 
         data = @underlying.read(@underlying.available)
-        expect(data[8, 4].unpack("N").first).to eq(456)
+        expect(data[8, 4].unpack1("N")).to eq(456)
       end
 
       it "should apply ZLIB transform" do