Simplify request flow

The handling of closing the client will be done by the client session
manager

Signed-off-by: davfsa <[email protected]>

Author: davfsa

hikari/impl/rest.py

@@ -751,45 +751,13 @@ async def _request(
         json: data_binding.JSONObjectBuilder | data_binding.JSONArray | None = None,
         reason: undefined.UndefinedOr[str] = undefined.UNDEFINED,
         auth: undefined.UndefinedNoneOr[str] = undefined.UNDEFINED,
-    ) -> None | data_binding.JSONObject | data_binding.JSONArray:
+    ) -> data_binding.JSONObject | data_binding.JSONArray | None:
+        # Make a ratelimit-protected HTTP request to a JSON endpoint and expect some form
+        # of JSON response.
         if not self._close_event:
             msg = "Cannot use an inactive REST client"
             raise errors.ComponentStateConflictError(msg)
 
-        request_task = asyncio.create_task(
-            self._perform_request(
-                compiled_route=compiled_route,
-                query=query,
-                form_builder=form_builder,
-                json=json,
-                reason=reason,
-                auth=auth,
-            )
-        )
-
-        await aio.first_completed(request_task, self._close_event.wait())
-
-        if not request_task.cancelled():
-            return request_task.result()
-
-        msg = "The REST client was closed mid-request"
-        raise errors.ComponentStateConflictError(msg)
-
-    # We rather keep everything we can here inline.
-    @typing.final
-    async def _perform_request(  # noqa: C901, PLR0912, PLR0915
-        self,
-        compiled_route: routes.CompiledRoute,
-        *,
-        query: data_binding.StringMapBuilder | None = None,
-        form_builder: data_binding.URLEncodedFormBuilder | None = None,
-        json: data_binding.JSONObject | data_binding.JSONArray | None = None,
-        reason: undefined.UndefinedOr[str] = undefined.UNDEFINED,
-        auth: undefined.UndefinedNoneOr[str] = undefined.UNDEFINED,
-    ) -> None | data_binding.JSONObject | data_binding.JSONArray:
-        # Make a ratelimit-protected HTTP request to a JSON endpoint and expect some form
-        # of JSON response.
-
         assert self._client_session is not None  # This will never be None here
 
         headers = data_binding.StringMapBuilder()