Skip to content

Commit b5794ae

Browse files
committed
formatting and commenting
1 parent afd730e commit b5794ae

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

lv_src/Request/raise_any_errors.vi

144 Bytes
Binary file not shown.

src/async_support.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
use crate::types::{RequestProgress, RequestStatus, Response, ERROR_KIND_NONE, ERROR_KIND_TIMEOUT, ERROR_KIND_CONNECTION, ERROR_KIND_REDIRECT, ERROR_KIND_INVALID_STATUS, ERROR_KIND_BODY, ERROR_KIND_DECODE, ERROR_KIND_BUILDER, ERROR_KIND_REQUEST, ERROR_KIND_FILE_SYSTEM, ERROR_KIND_UNKNOWN};
1+
use crate::types::{
2+
ERROR_KIND_BODY, ERROR_KIND_BUILDER, ERROR_KIND_CONNECTION, ERROR_KIND_DECODE,
3+
ERROR_KIND_FILE_SYSTEM, ERROR_KIND_INVALID_STATUS, ERROR_KIND_NONE, ERROR_KIND_REDIRECT,
4+
ERROR_KIND_REQUEST, ERROR_KIND_TIMEOUT, ERROR_KIND_UNKNOWN, RequestProgress, RequestStatus,
5+
Response,
6+
};
27
use reqwest::Response as ReqwestResponse;
38
use std::{
49
error::Error as StdError,
@@ -30,11 +35,11 @@ fn analyze_reqwest_error(e: &reqwest::Error) -> (u8, String, Option<String>, Opt
3035
};
3136

3237
let main_message = e.to_string();
33-
38+
3439
let url = e.url().map(|u| u.to_string());
35-
40+
3641
let source = e.source().map(|s| s.to_string());
37-
42+
3843
let detailed_message = if let Some(ref src) = source {
3944
format!("{}: {}", main_message, src)
4045
} else {
@@ -193,12 +198,12 @@ pub async fn process_request(
193198
Err(e) => {
194199
// Request error (connection failed, etc.)
195200
let (error_kind, error_message, error_url, error_source) = analyze_reqwest_error(&e);
196-
201+
197202
let mut progress = progress_info.write().unwrap();
198203
progress.status = RequestStatus::Error;
199204
progress.final_response = Some(Response {
200205
status: e.status().unwrap_or(reqwest::StatusCode::BAD_REQUEST),
201-
version: reqwest::Version::HTTP_11, // Default to HTTP/1.1 for errors
206+
version: reqwest::Version::HTTP_11, // Default to HTTP/1.1 for errors
202207
headers: reqwest::header::HeaderMap::new(),
203208
body: Err(error_message),
204209
error_kind,

src/ffi/request.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,7 @@ pub extern "C" fn request_read_response_version(
234234

235235
/// Get the error kind from a response
236236
#[unsafe(no_mangle)]
237-
pub extern "C" fn request_read_error_kind(
238-
request_id: RequestId,
239-
) -> u8 {
237+
pub extern "C" fn request_read_error_kind(request_id: RequestId) -> u8 {
240238
let tracker = REQUEST_TRACKER.lock().unwrap();
241239

242240
if let Some(progress_info) = tracker.get(&request_id) {

src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ pub use ffi::multipart::{
2828
multipart_form_create, multipart_form_destroy, multipart_form_read_error_message,
2929
};
3030
pub use ffi::request::{
31-
request_cancel, request_destroy, request_read_error_kind, request_read_error_message,
32-
request_read_error_source, request_read_error_url, request_has_error, request_is_complete,
33-
request_read_progress, request_read_received_bytes, request_read_response_body,
34-
request_read_response_headers, request_read_response_status, request_read_response_version,
35-
request_read_total_bytes,
31+
request_cancel, request_destroy, request_has_error, request_is_complete,
32+
request_read_error_kind, request_read_error_message, request_read_error_source,
33+
request_read_error_url, request_read_progress, request_read_received_bytes,
34+
request_read_response_body, request_read_response_headers, request_read_response_status,
35+
request_read_response_version, request_read_total_bytes,
3636
};
3737
pub use ffi::request_builder::{
3838
request_builder_basic_auth, request_builder_bearer_auth, request_builder_body,

0 commit comments

Comments
 (0)