Skip to content

Commit

Permalink
Fix warnings reported by clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
@exul
exul committed Nov 26, 2017
1 parent 00446c2 commit 1cfd9fc
Show file tree
Hide file tree
Showing 21 changed files with 86 additions and 87 deletions.
6 changes: 3 additions & 3 deletions src/matrix-rocketchat/api/matrix/mod.rs
View file
Expand Up @@ -94,7 +94,7 @@ impl MatrixApi {
let params = HashMap::new();

debug!(logger, "Querying homeserver {} for API versions", url);
let (body, status_code) = RestApi::call_matrix(GetSupportedVersionsEndpoint::method(), &url, "", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetSupportedVersionsEndpoint::method(), &url, "", &params)?;
if !status_code.is_success() {
let matrix_error_resp: MatrixErrorResponse = serde_json::from_str(&body).chain_err(|| {
ErrorKind::InvalidJSON(format!(
Expand All @@ -114,10 +114,10 @@ impl MatrixApi {
))
})?;
debug!(logger, "Homeserver supports versions {:?}", supported_versions.versions);
MatrixApi::get_max_supported_version_api(supported_versions.versions, config, logger)
MatrixApi::get_max_supported_version_api(&supported_versions.versions, config, logger)
}

fn get_max_supported_version_api(versions: Vec<String>, config: &Config, logger: Logger) -> Result<Box<MatrixApi>> {
fn get_max_supported_version_api(versions: &[String], config: &Config, logger: Logger) -> Result<Box<MatrixApi>> {
for version in versions.iter().rev() {
if version.starts_with("r0") {
let matrix_api = r0::MatrixApi::new(config, logger);
Expand Down
44 changes: 22 additions & 22 deletions src/matrix-rocketchat/api/matrix/r0.rs
View file
Expand Up @@ -83,7 +83,7 @@ impl super::MatrixApi for MatrixApi {
let mut params = self.params_hash();
params.insert("user_id", &user_id);

let (body, status_code) = RestApi::call_matrix(CreateRoomEndpoint::method(), &endpoint, &payload, &params)?;
let (body, status_code) = RestApi::call_matrix(&CreateRoomEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -103,7 +103,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &format!("/_matrix/client/r0/directory/room/{}", &encoded_room_alias);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(DeleteAliasEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&DeleteAliasEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -116,7 +116,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &ForgetRoomEndpoint::request_path(path_params);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(ForgetRoomEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&ForgetRoomEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -129,7 +129,7 @@ impl super::MatrixApi for MatrixApi {
let mut params = self.params_hash();
params.insert("user_id", &user_id);

let (body, status_code) = RestApi::call_matrix(SyncEventsEndpoint::method(), &endpoint, "", &params)?;
let (body, status_code) = RestApi::call_matrix(&SyncEventsEndpoint::method(), &endpoint, "", &params)?;

if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
Expand All @@ -150,7 +150,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &GetDisplayNameEndpoint::request_path(path_params);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(GetDisplayNameEndpoint::method(), &endpoint, "", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetDisplayNameEndpoint::method(), &endpoint, "", &params)?;
if status_code == StatusCode::NotFound {
return Ok(None);
}
Expand All @@ -175,7 +175,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &format!("/_matrix/client/r0/directory/room/{}", &encoded_room_alias);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(GetAliasEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetAliasEndpoint::method(), &endpoint, "{}", &params)?;
if status_code == StatusCode::NotFound {
return Ok(None);
}
Expand All @@ -198,7 +198,7 @@ impl super::MatrixApi for MatrixApi {
let mut params = self.params_hash();
params.insert("user_id", &user_id);

let (body, status_code) = RestApi::call_matrix(GetStateEvents::method(), &endpoint, "", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetStateEvents::method(), &endpoint, "", &params)?;

if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
Expand Down Expand Up @@ -231,7 +231,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &GetStateEventsForEmptyKeyEndpoint::request_path(path_params);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
if status_code == StatusCode::NotFound {
return Ok(None);
}
Expand Down Expand Up @@ -263,7 +263,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &GetStateEventsForEmptyKeyEndpoint::request_path(path_params);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand Down Expand Up @@ -292,7 +292,7 @@ impl super::MatrixApi for MatrixApi {
params.insert("user_id", &user_id);
}

let (body, status_code) = RestApi::call_matrix(GetMemberEventsEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetMemberEventsEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -313,7 +313,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &GetStateEventsForEmptyKeyEndpoint::request_path(path_params);
let params = self.params_hash();

let (body, status_code) = RestApi::call_matrix(GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
if status_code == StatusCode::NotFound {
return Ok(None);
}
Expand Down Expand Up @@ -344,7 +344,7 @@ impl super::MatrixApi for MatrixApi {
};
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("invite"))?;

let (body, status_code) = RestApi::call_matrix(InviteUserEndpoint::method(), &endpoint, &payload, &params)?;
let (body, status_code) = RestApi::call_matrix(&InviteUserEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -361,7 +361,7 @@ impl super::MatrixApi for MatrixApi {
let endpoint = self.base_url.clone() + &GetStateEventsForEmptyKeyEndpoint::request_path(path_params);
let params = self.params_hash();

let (_, status_code) = RestApi::call_matrix(GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;
let (_, status_code) = RestApi::call_matrix(&GetStateEventsForEmptyKeyEndpoint::method(), &endpoint, "{}", &params)?;

Ok(status_code != StatusCode::Forbidden)
}
Expand All @@ -375,7 +375,7 @@ impl super::MatrixApi for MatrixApi {
let mut params = self.params_hash();
params.insert("user_id", &user_id);

let (body, status_code) = RestApi::call_matrix(JoinRoomByIdEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&JoinRoomByIdEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -392,7 +392,7 @@ impl super::MatrixApi for MatrixApi {
params.insert("user_id", &user_id);


let (body, status_code) = RestApi::call_matrix(LeaveRoomEndpoint::method(), &endpoint, "{}", &params)?;
let (body, status_code) = RestApi::call_matrix(&LeaveRoomEndpoint::method(), &endpoint, "{}", &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -416,7 +416,7 @@ impl super::MatrixApi for MatrixApi {
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("canonical room alias"))?;

let (body, status_code) =
RestApi::call_matrix(SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
RestApi::call_matrix(&SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -436,7 +436,7 @@ impl super::MatrixApi for MatrixApi {
};
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("account"))?;

let (body, status_code) = RestApi::call_matrix(RegisterEndpoint::method(), &endpoint, &payload, &params)?;
let (body, status_code) = RestApi::call_matrix(&RegisterEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -462,7 +462,7 @@ impl super::MatrixApi for MatrixApi {
let mut params = self.params_hash();
params.insert("user_id", &user_id);

let (body, status_code) = RestApi::call_matrix(SendMessageEventEndpoint::method(), &endpoint, &payload, &params)?;
let (body, status_code) = RestApi::call_matrix(&SendMessageEventEndpoint::method(), &endpoint, &payload, &params)?;

if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
Expand Down Expand Up @@ -493,7 +493,7 @@ impl super::MatrixApi for MatrixApi {
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("power levels"))?;

let (body, status_code) =
RestApi::call_matrix(SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
RestApi::call_matrix(&SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -513,7 +513,7 @@ impl super::MatrixApi for MatrixApi {
};
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("set display name"))?;

let (body, status_code) = RestApi::call_matrix(SetDisplayNameEndpoint::method(), &endpoint, &payload, &params)?;
let (body, status_code) = RestApi::call_matrix(&SetDisplayNameEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -532,7 +532,7 @@ impl super::MatrixApi for MatrixApi {
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("room name"))?;

let (body, status_code) =
RestApi::call_matrix(SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
RestApi::call_matrix(&SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand All @@ -551,7 +551,7 @@ impl super::MatrixApi for MatrixApi {
let payload = serde_json::to_string(&body_params).chain_err(|| body_params_error!("room topic"))?;

let (body, status_code) =
RestApi::call_matrix(SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
RestApi::call_matrix(&SendStateEventForEmptyKeyEndpoint::method(), &endpoint, &payload, &params)?;
if !status_code.is_success() {
return Err(build_error(&endpoint, &body, &status_code));
}
Expand Down
12 changes: 6 additions & 6 deletions src/matrix-rocketchat/api/rest_api.rs
View file
Expand Up @@ -15,29 +15,29 @@ pub struct RestApi {}
impl RestApi {
/// Call a matrix REST API endpoint
pub fn call_matrix<'a>(
method: RumaHttpMethod,
method: &RumaHttpMethod,
url: &str,
payload: &str,
params: &HashMap<&str, &'a str>,
) -> Result<(String, StatusCode)> {
let method = match method {
let method = match *method {
RumaHttpMethod::Delete => Method::Delete,
RumaHttpMethod::Get => Method::Get,
RumaHttpMethod::Post => Method::Post,
RumaHttpMethod::Put => Method::Put,
};

RestApi::call(method, url, payload, params, None)
RestApi::call(&method, url, payload, params, None)
}

/// Call a Rocket.Chat API endpoint
pub fn call_rocketchat(endpoint: &Endpoint) -> Result<(String, StatusCode)> {
RestApi::call(endpoint.method(), &endpoint.url(), &endpoint.payload()?, &endpoint.query_params(), endpoint.headers())
RestApi::call(&endpoint.method(), &endpoint.url(), &endpoint.payload()?, &endpoint.query_params(), endpoint.headers())
}

/// Call a REST API endpoint
pub fn call<'a>(
method: Method,
method: &Method,
url: &str,
payload: &str,
params: &HashMap<&str, &'a str>,
Expand All @@ -46,7 +46,7 @@ impl RestApi {
let client = Client::new();
let encoded_url = RestApi::encode_url(url.to_string(), params)?;

let mut req = match method {
let mut req = match *method {
Method::Get => client.get(&encoded_url),
Method::Put => client.put(&encoded_url),
Method::Post => client.post(&encoded_url),
Expand Down
2 changes: 1 addition & 1 deletion src/matrix-rocketchat/api/rocketchat/mod.rs
View file
Expand Up @@ -101,7 +101,7 @@ impl RocketchatApi {
let url = base_url.clone() + "/api/info";
let params = HashMap::new();

let (body, status_code) = match RestApi::call(Method::Get, &url, "", &params, None) {
let (body, status_code) = match RestApi::call(&Method::Get, &url, "", &params, None) {
Ok((body, status_code)) => (body, status_code),
Err(err) => {
debug!(logger, "{}", err);
Expand Down
2 changes: 1 addition & 1 deletion src/matrix-rocketchat/handlers/iron/rocketchat.rs
View file
Expand Up @@ -20,7 +20,7 @@ pub struct Rocketchat {

impl Rocketchat {
/// Rocket.Chat endpoint with middleware
pub fn chain(config: Config, matrix_api: Box<MatrixApi>) -> Chain {
pub fn chain(config: &Config, matrix_api: Box<MatrixApi>) -> Chain {
let rocketchat = Rocketchat {
config: config.clone(),
matrix_api: matrix_api,
Expand Down
16 changes: 8 additions & 8 deletions src/matrix-rocketchat/handlers/matrix/command_handler.rs
View file
Expand Up @@ -105,7 +105,7 @@ impl<'a> CommandHandler<'a> {
let rocketchat_id = command.by_ref().next().unwrap_or_default();
self.connect_new_rocketchat_server(rocketchat_id, rocketchat_url, token, &event.user_id)?
}
None => self.get_existing_rocketchat_server(rocketchat_url.to_string())?,
None => self.get_existing_rocketchat_server(rocketchat_url)?,
};

let new_user_on_rocketchat_server = NewUserOnRocketchatServer {
Expand Down Expand Up @@ -274,7 +274,7 @@ impl<'a> CommandHandler<'a> {
}
None => channel.bridge(
rocketchat_api.as_ref(),
Some(channel_name.to_string()),
&Some(channel_name.to_string()),
&rocketchat_channel.usernames,
&bot_user_id,
&event.user_id,
Expand All @@ -300,13 +300,13 @@ impl<'a> CommandHandler<'a> {
);

let channel =
Channel::from_name(self.config, self.logger, self.matrix_api, name.clone(), &server.id, rocketchat_api.as_ref())?;
Channel::from_name(self.config, self.logger, self.matrix_api, &name, &server.id, rocketchat_api.as_ref())?;
let room_id = match channel.matrix_id()? {
Some(room_id) => room_id,
None => {
bail_error!(
ErrorKind::UnbridgeOfNotBridgedRoom(name.to_string()),
t!(["errors", "unbridge_of_not_bridged_room"]).with_vars(vec![("channel_name", name)])
t!(["errors", "unbridge_of_not_bridged_room"]).with_vars(vec![("channel_name", name.clone())])
);
}
};
Expand All @@ -319,7 +319,7 @@ impl<'a> CommandHandler<'a> {
let user_ids = user_ids.iter().map(|id| id.to_string()).collect::<Vec<String>>().join(", ");
bail_error!(
ErrorKind::RoomNotEmpty(name.to_string(), user_ids.clone()),
t!(["errors", "room_not_empty"]).with_vars(vec![("channel_name", name), ("users", user_ids)])
t!(["errors", "room_not_empty"]).with_vars(vec![("channel_name", name.clone()), ("users", user_ids)])
);
}

Expand All @@ -330,7 +330,7 @@ impl<'a> CommandHandler<'a> {
bail_error!(
ErrorKind::RoomAssociatedWithAliases(name.to_string(), user_aliases.clone()),
t!(["errors", "room_assocaited_with_aliases"])
.with_vars(vec![("channel_name", name), ("aliases", user_aliases)])
.with_vars(vec![("channel_name", name.clone()), ("aliases", user_aliases)])
);
}

Expand All @@ -345,8 +345,8 @@ impl<'a> CommandHandler<'a> {
Ok(info!(self.logger, "Successfully unbridged room {}", name.clone()))
}

fn get_existing_rocketchat_server(&self, rocketchat_url: String) -> Result<RocketchatServer> {
let server: RocketchatServer = match RocketchatServer::find_by_url(self.connection, &rocketchat_url)? {
fn get_existing_rocketchat_server(&self, rocketchat_url: &str) -> Result<RocketchatServer> {
let server: RocketchatServer = match RocketchatServer::find_by_url(self.connection, rocketchat_url)? {
Some(server) => server,
None => {
bail_error!(ErrorKind::RocketchatTokenMissing, t!(["errors", "rocketchat_token_missing"]));
Expand Down

0 comments on commit 1cfd9fc

Please sign in to comment.