[fractal] Slipped warnings fixed
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] Slipped warnings fixed
- Date: Wed, 24 Jun 2020 07:01:52 +0000 (UTC)
commit 5791104441ffd89bbcfd5e3e013f77c667bb1b6f
Author: Günther Wagner <info gunibert de>
Date: Tue Jun 23 19:33:31 2020 +0200
Slipped warnings fixed
Some warnings got reapplied and happened in the other merge request.
Fixed these along with this commit.
fractal-gtk/src/widgets/image.rs | 2 +-
fractal-gtk/src/widgets/inline_player.rs | 2 +-
fractal-gtk/src/widgets/media_viewer.rs | 16 +++-------------
fractal-gtk/src/widgets/message.rs | 12 ++++++------
fractal-gtk/src/widgets/room.rs | 6 ++----
fractal-matrix-api/src/backend/room.rs | 4 +---
6 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/fractal-gtk/src/widgets/image.rs b/fractal-gtk/src/widgets/image.rs
index 893d6b4c..f6b030b8 100644
--- a/fractal-gtk/src/widgets/image.rs
+++ b/fractal-gtk/src/widgets/image.rs
@@ -197,7 +197,7 @@ impl Image {
};
if let Ok(zoom_level_guard) = zoom_level.lock() {
- if let Some(zl) = zoom_level_guard.clone() {
+ if let Some(zl) = *zoom_level_guard {
pw = (pb.get_width() as f64 * zl) as i32;
ph = (pb.get_height() as f64 * zl) as i32;
}
diff --git a/fractal-gtk/src/widgets/inline_player.rs b/fractal-gtk/src/widgets/inline_player.rs
index 27a8ea01..6084f38b 100644
--- a/fractal-gtk/src/widgets/inline_player.rs
+++ b/fractal-gtk/src/widgets/inline_player.rs
@@ -507,7 +507,7 @@ impl<T: MediaPlayer + 'static> PlayerExt for T {
Sender<Result<String, Error>>,
Receiver<Result<String, Error>>,
) = channel();
- media::get_media_async(thread_pool, server_url.clone(), media_url.clone(), tx);
+ media::get_media_async(thread_pool, server_url.clone(), media_url.to_string(), tx);
let local_path = player.get_local_path_access();
gtk::timeout_add(
50,
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index 3411004d..fa1b936e 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -716,7 +716,7 @@ impl MediaViewer {
image::Image::new(&self.backend, self.data.borrow().server_url.clone(), &url)
.shrink_to_fit(true)
.center(true)
- .build(thread_pool.clone());
+ .build(thread_pool);
media_viewport.add(&image.widget);
media_viewport.show_all();
@@ -906,12 +906,7 @@ impl MediaViewer {
previous_media_button.connect_clicked(move |_| {
if let Some(own) = own_weak.upgrade() {
if !own.borrow_mut().previous_media(t_pool.clone()) {
- load_more_media(
- t_pool.clone(),
- own.clone(),
- builder.clone(),
- backend.clone(),
- );
+ load_more_media(t_pool.clone(), own, builder.clone(), backend.clone());
}
}
});
@@ -1091,12 +1086,7 @@ fn load_more_media(
data.borrow_mut().media_list = new_media_list;
data.borrow_mut().prev_batch = Some(prev_batch);
if img_msgs_count == 0 {
- load_more_media(
- thread_pool.clone(),
- data.clone(),
- builder.clone(),
- backend.clone(),
- );
+ load_more_media(thread_pool, data, builder.clone(), backend.clone());
} else {
data.borrow_mut().current_media_index += img_msgs_count;
data.borrow_mut().previous_media(thread_pool);
diff --git a/fractal-gtk/src/widgets/message.rs b/fractal-gtk/src/widgets/message.rs
index c2c3f5cf..ddbac285 100644
--- a/fractal-gtk/src/widgets/message.rs
+++ b/fractal-gtk/src/widgets/message.rs
@@ -85,7 +85,7 @@ impl MessageBox {
RowType::Emote => {
self.row.set_margin_top(12);
self.header = false;
- self.small_widget(thread_pool.clone(), msg)
+ self.small_widget(thread_pool, msg)
}
RowType::Video if is_temp => {
upload_attachment_msg
@@ -109,7 +109,7 @@ impl MessageBox {
_ if has_header => {
self.row.set_margin_top(12);
self.header = true;
- self.widget(thread_pool.clone(), user_info_cache, msg)
+ self.widget(thread_pool, user_info_cache, msg)
}
_ => {
self.header = false;
@@ -151,7 +151,7 @@ impl MessageBox {
let w = if has_header && msg.mtype != RowType::Emote {
self.row.set_margin_top(12);
self.header = true;
- self.widget(thread_pool.clone(), user_info_cache, &msg)
+ self.widget(thread_pool, user_info_cache, &msg)
} else {
if let RowType::Emote = msg.mtype {
self.row.set_margin_top(12);
@@ -223,10 +223,10 @@ impl MessageBox {
}
let body = match msg.mtype {
- RowType::Sticker => self.build_room_msg_sticker(thread_pool.clone(), msg),
- RowType::Image => self.build_room_msg_image(thread_pool.clone(), msg),
+ RowType::Sticker => self.build_room_msg_sticker(thread_pool, msg),
+ RowType::Image => self.build_room_msg_image(thread_pool, msg),
RowType::Emote => self.build_room_msg_emote(msg),
- RowType::Audio => self.build_room_audio_player(thread_pool.clone(), msg),
+ RowType::Audio => self.build_room_audio_player(thread_pool, msg),
RowType::Video => self.build_room_video_player(thread_pool, msg),
RowType::File => self.build_room_msg_file(msg),
_ => self.build_room_msg_body(msg),
diff --git a/fractal-gtk/src/widgets/room.rs b/fractal-gtk/src/widgets/room.rs
index 1cdbe967..50a9486a 100644
--- a/fractal-gtk/src/widgets/room.rs
+++ b/fractal-gtk/src/widgets/room.rs
@@ -139,10 +139,8 @@ impl<'a> RoomBox<'a> {
APPOP!(reload_rooms);
}
Err(err) => {
- tx.send(BKCommand::SendBKResponse(BKResponse::JoinRoomError(
- err.into(),
- )))
- .expect_log("Connection closed");
+ tx.send(BKCommand::SendBKResponse(BKResponse::JoinRoomError(err)))
+ .expect_log("Connection closed");
}
}
});
diff --git a/fractal-matrix-api/src/backend/room.rs b/fractal-matrix-api/src/backend/room.rs
index a9a2b01c..42e7f98c 100644
--- a/fractal-matrix-api/src/backend/room.rs
+++ b/fractal-matrix-api/src/backend/room.rs
@@ -536,9 +536,7 @@ fn update_direct_chats(
directs.insert(user.uid, vec![room_id]);
}
- let params = SetGlobalAccountDataParameters {
- access_token: access_token.clone(),
- };
+ let params = SetGlobalAccountDataParameters { access_token };
let request = set_global_account_data(base, ¶ms, &json!(directs), &user_id, "m.direct")?;
HTTP_CLIENT.get_client()?.execute(request)?;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]