Skip to content

Commit 56255ea

Browse files
committed
Reformat codes.
1 parent e4f7df0 commit 56255ea

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

examples/http-client/src/client.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use crate::{
22
errors::HttpClientError, replace_and_get, replace_and_set, request::REQUEST_BUILDER_CLASS_NAME,
3-
response::RESPONSE_CLASS_NAME,
43
};
54
use phper::{
65
classes::{ClassEntry, DynamicClass, Visibility},
76
functions::Argument,
87
objects::Object,
98
};
109
use reqwest::blocking::{Client, ClientBuilder, RequestBuilder};
11-
use std::{convert::TryInto, mem::swap, time::Duration};
10+
use std::time::Duration;
1211

1312
const HTTP_CLIENT_BUILDER_CLASS_NAME: &'static str = "HttpClient\\HttpClientBuilder";
1413
const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
@@ -47,7 +46,7 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
4746
class.add_method(
4847
"build",
4948
Visibility::Public,
50-
|this, arguments| {
49+
|this, _arguments| {
5150
let state = this.as_mut_state();
5251
let client = replace_and_get(state, ClientBuilder::new(), ClientBuilder::build)?;
5352
let mut object =

examples/http-client/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
response::make_response_class,
66
};
77
use phper::{modules::Module, php_get_module};
8-
use std::mem::{replace, swap};
8+
use std::mem::replace;
99

1010
pub mod client;
1111
pub mod errors;
@@ -29,11 +29,11 @@ pub fn get_module() -> Module {
2929
module
3030
}
3131

32-
fn replace_and_set<T>(t: &mut T, mut init: T, f: impl FnOnce(T) -> T) {
32+
fn replace_and_set<T>(t: &mut T, init: T, f: impl FnOnce(T) -> T) {
3333
let x = f(replace(t, init));
3434
let _ = replace(t, x);
3535
}
3636

37-
fn replace_and_get<T, R>(t: &mut T, mut init: T, f: impl FnOnce(T) -> R) -> R {
37+
fn replace_and_get<T, R>(t: &mut T, init: T, f: impl FnOnce(T) -> R) -> R {
3838
f(replace(t, init))
3939
}

examples/http-client/src/request.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use phper::{
33
classes::{ClassEntry, DynamicClass, Visibility},
44
objects::Object,
55
};
6-
use reqwest::blocking::{Request, RequestBuilder, Response};
6+
use reqwest::blocking::{RequestBuilder, Response};
77

88
pub const REQUEST_BUILDER_CLASS_NAME: &'static str = "HttpClient\\RequestBuilder";
99

@@ -20,7 +20,7 @@ pub fn make_request_builder_class() -> DynamicClass<Option<RequestBuilder>> {
2020
class.add_method(
2121
"send",
2222
Visibility::Public,
23-
|this, arguments| {
23+
|this, _arguments| {
2424
let state = this.as_mut_state();
2525
let response = replace_and_get(state, None, |builder| builder.unwrap().send())?;
2626
let mut object =

examples/http-client/src/response.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
use crate::{errors::HttpClientError, replace_and_get};
2-
use bytes::Bytes;
32
use indexmap::map::IndexMap;
43
use phper::{
54
classes::{DynamicClass, Visibility},
65
objects::Object,
76
};
8-
use reqwest::{blocking::Response, header::HeaderMap, StatusCode};
9-
use std::{convert::Infallible, net::SocketAddr};
7+
use reqwest::blocking::Response;
108

119
pub const RESPONSE_CLASS_NAME: &'static str = "HttpClient\\Response";
1210

phper/src/classes.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::{
44
alloc::EBox,
5-
errors::{ClassNotFoundError, StateTypeError, Throwable},
5+
errors::{ClassNotFoundError, StateTypeError},
66
functions::{Argument, Function, FunctionEntity, FunctionEntry, Method},
77
objects::{ExtendObject, Object},
88
sys::*,
@@ -13,7 +13,6 @@ use dashmap::DashMap;
1313
use once_cell::sync::OnceCell;
1414
use std::{
1515
any::{Any, TypeId},
16-
convert::Infallible,
1716
marker::PhantomData,
1817
mem::{size_of, zeroed, ManuallyDrop},
1918
os::raw::c_int,

tests/integration/src/classes.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
use phper::{classes::DynamicClass, modules::Module};
1+
use phper::modules::Module;
22

33
pub fn integrate(module: &mut Module) {
44
integrate_a(module);
55
}
66

7-
fn integrate_a(module: &mut Module) {
7+
// TODO Write class tests.
8+
fn integrate_a(_module: &mut Module) {
89
// let class = DynamicClass::new_with_constructor("IntegrationTest\\A", ||);
910
}

0 commit comments

Comments
 (0)