lib/faraday/request.rb in faraday-1.9.3 vs lib/faraday/request.rb in faraday-1.10.0

@@ -42,11 +42,12 @@
                         ],
                         token_auth: [
                           :TokenAuthentication,
                           'token_authentication'
                         ],
-                        instrumentation: [:Instrumentation, 'instrumentation']
+                        instrumentation: [:Instrumentation, 'instrumentation'],
+                        json: [:Json, 'json']
 
     # @param request_method [String]
     # @yield [request] for block customization, if block given
     # @yieldparam request [Request]
     # @return [Request]
@@ -136,14 +137,14 @@
     # Marshal serialization support.
     # Restores the instance variables according to the +serialised+.
     # @param serialised [Hash] the serialised object.
     def marshal_load(serialised)
       self.http_method = serialised[:http_method]
-      self.body        = serialised[:body]
-      self.headers     = serialised[:headers]
-      self.path        = serialised[:path]
-      self.params      = serialised[:params]
-      self.options     = serialised[:options]
+      self.body = serialised[:body]
+      self.headers = serialised[:headers]
+      self.path = serialised[:path]
+      self.params = serialised[:params]
+      self.options = serialised[:options]
     end
 
     # @return [Env] the Env for this Request
     def to_env(connection)
       Env.new(http_method, body, connection.build_exclusive_url(path, params),