GNOME.org
 

[fractal] Remove all unused stuff and enable lints to deny it

commit cd61a6eae10ceb3ff5e3db94e781e931b082e048
Author: Alejandro Domínguez <adomu net-c com>
Date:   Wed Sep 2 18:25:36 2020 +0200

    Remove all unused stuff and enable lints to deny it

 fractal-gtk/src/actions/account_settings.rs |  2 +-
 fractal-gtk/src/actions/global.rs           |  2 +-
 fractal-gtk/src/actions/message.rs          |  2 +-
 fractal-gtk/src/actions/room_settings.rs    |  2 +-
 fractal-gtk/src/app/connect/directory.rs    |  2 +-
 fractal-gtk/src/appop/about.rs              |  2 +-
 fractal-gtk/src/appop/account.rs            |  2 +-
 fractal-gtk/src/appop/attach.rs             |  2 +-
 fractal-gtk/src/appop/invite.rs             |  2 +-
 fractal-gtk/src/appop/mod.rs                |  2 +-
 fractal-gtk/src/appop/notify.rs             |  2 +-
 fractal-gtk/src/appop/room.rs               |  2 +-
 fractal-gtk/src/appop/sync.rs               |  2 +-
 fractal-gtk/src/backend/directory.rs        |  2 +-
 fractal-gtk/src/backend/register.rs         |  2 +-
 fractal-gtk/src/backend/room.rs             |  2 +-
 fractal-gtk/src/backend/user.rs             |  2 +-
 fractal-gtk/src/cache/state.rs              | 37 -----------------------------
 fractal-gtk/src/main.rs                     |  3 ++-
 fractal-gtk/src/meson.build                 |  6 ++---
 fractal-gtk/src/model/room.rs               |  1 +
 fractal-gtk/src/uibuilder.rs                |  2 +-
 fractal-gtk/src/uitypes.rs                  |  2 --
 fractal-gtk/src/{ => util}/i18n.rs          |  0
 fractal-gtk/src/{util.rs => util/mod.rs}    |  4 ++++
 fractal-gtk/src/widgets/file_dialog.rs      |  2 +-
 fractal-gtk/src/widgets/image.rs            | 18 --------------
 fractal-gtk/src/widgets/inline_player.rs    |  2 +-
 fractal-gtk/src/widgets/kicked_dialog.rs    |  2 +-
 fractal-gtk/src/widgets/login.rs            |  2 +-
 fractal-gtk/src/widgets/media_viewer.rs     |  2 +-
 fractal-gtk/src/widgets/members_list.rs     | 21 +---------------
 fractal-gtk/src/widgets/message.rs          |  2 +-
 fractal-gtk/src/widgets/room.rs             |  2 +-
 fractal-gtk/src/widgets/room_history.rs     |  2 +-
 fractal-gtk/src/widgets/room_settings.rs    |  8 +------
 fractal-gtk/src/widgets/roomlist.rs         |  2 +-
 fractal-gtk/src/widgets/scroll_widget.rs    |  9 +------
 38 files changed, 40 insertions(+), 123 deletions(-)
---
diff --git a/fractal-gtk/src/actions/account_settings.rs b/fractal-gtk/src/actions/account_settings.rs
index 597692b4..bb8a26c0 100644
--- a/fractal-gtk/src/actions/account_settings.rs
+++ b/fractal-gtk/src/actions/account_settings.rs
@@ -1,5 +1,5 @@
 use crate::backend::{user, HandleError};
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use gio::prelude::*;
 use gio::SimpleAction;
 use gio::SimpleActionGroup;
diff --git a/fractal-gtk/src/actions/global.rs b/fractal-gtk/src/actions/global.rs
index 3d2b5d47..9a079cb9 100644
--- a/fractal-gtk/src/actions/global.rs
+++ b/fractal-gtk/src/actions/global.rs
@@ -5,8 +5,8 @@ use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
 use crate::appop::AppOp;
-use crate::i18n::i18n;
 use crate::types::Message;
+use crate::util::i18n::i18n;
 use crate::widgets::FileDialog::open;
 use crate::App;
 use fractal_api::identifiers::{EventId, RoomId};
diff --git a/fractal-gtk/src/actions/message.rs b/fractal-gtk/src/actions/message.rs
index d08d2f2d..a3234821 100644
--- a/fractal-gtk/src/actions/message.rs
+++ b/fractal-gtk/src/actions/message.rs
@@ -14,9 +14,9 @@ use std::thread;
 
 use crate::actions::AppState;
 use crate::backend::HandleError;
-use crate::i18n::i18n;
 use crate::types::Message;
 use crate::uibuilder::UI;
+use crate::util::i18n::i18n;
 use crate::App;
 use fractal_api::url::Url;
 use gio::ActionGroupExt;
diff --git a/fractal-gtk/src/actions/room_settings.rs b/fractal-gtk/src/actions/room_settings.rs
index 9bcfd89e..10c22337 100644
--- a/fractal-gtk/src/actions/room_settings.rs
+++ b/fractal-gtk/src/actions/room_settings.rs
@@ -11,7 +11,7 @@ use std::thread;
 
 use crate::app::App;
 use crate::backend::HandleError;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use crate::widgets::ErrorDialog;
 use crate::widgets::FileDialog::open;
diff --git a/fractal-gtk/src/app/connect/directory.rs b/fractal-gtk/src/app/connect/directory.rs
index 3fa88817..232cce21 100644
--- a/fractal-gtk/src/app/connect/directory.rs
+++ b/fractal-gtk/src/app/connect/directory.rs
@@ -1,6 +1,6 @@
 use glib::clone;
 
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use gtk::prelude::*;
 use libhandy::{Column, ColumnExt};
diff --git a/fractal-gtk/src/appop/about.rs b/fractal-gtk/src/appop/about.rs
index 8820c36e..e04031d5 100644
--- a/fractal-gtk/src/appop/about.rs
+++ b/fractal-gtk/src/appop/about.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use gtk::prelude::*;
 
diff --git a/fractal-gtk/src/appop/account.rs b/fractal-gtk/src/appop/account.rs
index 23f5be35..0c2aa268 100644
--- a/fractal-gtk/src/appop/account.rs
+++ b/fractal-gtk/src/appop/account.rs
@@ -9,7 +9,7 @@ use crate::appop::AppOp;
 use crate::appop::AppState;
 use crate::backend::HandleError;
 
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::widgets;
 use crate::widgets::AvatarExt;
 
diff --git a/fractal-gtk/src/appop/attach.rs b/fractal-gtk/src/appop/attach.rs
index 44315b98..95f51d5e 100644
--- a/fractal-gtk/src/appop/attach.rs
+++ b/fractal-gtk/src/appop/attach.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use glib::clone;
 use std::fs::File;
diff --git a/fractal-gtk/src/appop/invite.rs b/fractal-gtk/src/appop/invite.rs
index 9074b930..be6fb079 100644
--- a/fractal-gtk/src/appop/invite.rs
+++ b/fractal-gtk/src/appop/invite.rs
@@ -1,4 +1,4 @@
-use crate::i18n::{i18n, i18n_k};
+use crate::util::i18n::{i18n, i18n_k};
 
 use crate::backend::room;
 use fractal_api::identifiers::{RoomId, UserId};
diff --git a/fractal-gtk/src/appop/mod.rs b/fractal-gtk/src/appop/mod.rs
index 8b7a4f1b..328d1094 100644
--- a/fractal-gtk/src/appop/mod.rs
+++ b/fractal-gtk/src/appop/mod.rs
@@ -14,7 +14,7 @@ use crate::backend::ThreadPool;
 use crate::cache::CacheMap;
 use fractal_api::url::Url;
 
-use crate::i18n;
+use crate::util::i18n;
 
 use crate::types::Member;
 use crate::types::Room;
diff --git a/fractal-gtk/src/appop/notify.rs b/fractal-gtk/src/appop/notify.rs
index 0cc66cf9..959965e1 100644
--- a/fractal-gtk/src/appop/notify.rs
+++ b/fractal-gtk/src/appop/notify.rs
@@ -12,7 +12,7 @@ use std::sync::mpsc::channel;
 use std::sync::mpsc::TryRecvError;
 use std::sync::mpsc::{Receiver, Sender};
 
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use crate::appop::AppOp;
 
diff --git a/fractal-gtk/src/appop/room.rs b/fractal-gtk/src/appop/room.rs
index 970588cb..cac931a7 100644
--- a/fractal-gtk/src/appop/room.rs
+++ b/fractal-gtk/src/appop/room.rs
@@ -1,5 +1,5 @@
 use crate::backend::room;
-use crate::i18n::{i18n, i18n_k, ni18n_f};
+use crate::util::i18n::{i18n, i18n_k, ni18n_f};
 use fractal_api::identifiers::{DeviceId, RoomId};
 use fractal_api::url::Url;
 use log::{error, warn};
diff --git a/fractal-gtk/src/appop/sync.rs b/fractal-gtk/src/appop/sync.rs
index 7f522756..52f82353 100644
--- a/fractal-gtk/src/appop/sync.rs
+++ b/fractal-gtk/src/appop/sync.rs
@@ -1,7 +1,7 @@
 use log::info;
 use std::thread;
 
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use crate::app::App;
 use crate::appop::AppOp;
diff --git a/fractal-gtk/src/backend/directory.rs b/fractal-gtk/src/backend/directory.rs
index 69adc9e5..f8a8d427 100644
--- a/fractal-gtk/src/backend/directory.rs
+++ b/fractal-gtk/src/backend/directory.rs
@@ -22,7 +22,7 @@ use fractal_api::r0::AccessToken;
 
 use super::{dw_media, ContentType, HandleError};
 use crate::app::App;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::APPOP;
 
 #[derive(Debug)]
diff --git a/fractal-gtk/src/backend/register.rs b/fractal-gtk/src/backend/register.rs
index 63347c12..89b1377b 100644
--- a/fractal-gtk/src/backend/register.rs
+++ b/fractal-gtk/src/backend/register.rs
@@ -20,7 +20,7 @@ use fractal_api::r0::Medium;
 
 use super::HandleError;
 use crate::app::App;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::APPOP;
 
 #[derive(Debug)]
diff --git a/fractal-gtk/src/backend/room.rs b/fractal-gtk/src/backend/room.rs
index b26fa827..68d6839a 100644
--- a/fractal-gtk/src/backend/room.rs
+++ b/fractal-gtk/src/backend/room.rs
@@ -91,7 +91,7 @@ use super::{
     dw_media, get_prev_batch_from, remove_matrix_access_token_if_present, ContentType, HandleError,
 };
 use crate::app::App;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::APPOP;
 
 #[derive(Debug)]
diff --git a/fractal-gtk/src/backend/user.rs b/fractal-gtk/src/backend/user.rs
index c155c7f0..6c4221d8 100644
--- a/fractal-gtk/src/backend/user.rs
+++ b/fractal-gtk/src/backend/user.rs
@@ -75,7 +75,7 @@ use super::{dw_media, ContentType};
 
 use super::{remove_matrix_access_token_if_present, HandleError};
 use crate::app::App;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::APPOP;
 
 pub type UserInfo = (String, PathBuf);
diff --git a/fractal-gtk/src/cache/state.rs b/fractal-gtk/src/cache/state.rs
index 0e62c59b..19bc1212 100644
--- a/fractal-gtk/src/cache/state.rs
+++ b/fractal-gtk/src/cache/state.rs
@@ -1,7 +1,6 @@
 use lazy_static::lazy_static;
 use mdl::Cache;
 use mdl::Model;
-use mdl::Store;
 use serde::{Deserialize, Serialize};
 
 use anyhow::{anyhow, Error};
@@ -49,35 +48,6 @@ impl Model for AppState {
     }
 }
 
-impl AppRoom {
-    #[allow(dead_code)]
-    fn store_msgs<S: Store>(&self, store: &S) -> Result<(), Error> {
-        for msg in self.room.borrow().messages.iter() {
-            let m = AppMsg { msg: msg.clone() };
-            m.store(store)?;
-        }
-
-        Ok(())
-    }
-
-    #[allow(dead_code)]
-    fn load_msgs<S: Store>(&mut self, store: &S) -> Result<(), Error> {
-        let key = format!("msg:{}", self.room.borrow().id);
-        let msgs: Vec<Message> = AppMsg::all(store, &key)?
-            .iter()
-            .map(|m| m.msg.clone())
-            .collect();
-        self.room.borrow_mut().messages = msgs;
-
-        Ok(())
-    }
-
-    #[allow(dead_code)]
-    fn clear_msgs(&self) {
-        self.room.borrow_mut().messages = vec![];
-    }
-}
-
 impl Model for AppRoom {
     fn key(&self) -> String {
         format!("room:{}", self.room.borrow().id)
@@ -130,13 +100,6 @@ impl FCache {
         remove_dir_all(fname).or_else(|_| Err(anyhow!("Can't remove cache file")))
     }
 
-    #[allow(dead_code)]
-    pub fn get_room(&self, id: &str) -> Result<Room, Error> {
-        let cache = self.get_store();
-        let r = AppRoom::get(cache.as_ref().unwrap(), id)?;
-        Ok(r.room.into_inner())
-    }
-
     pub fn get_rooms(&self) -> Result<Vec<Room>, Error> {
         let cache = self.get_store();
         let rooms = AppRoom::all(cache.as_ref().unwrap(), "room")?
diff --git a/fractal-gtk/src/main.rs b/fractal-gtk/src/main.rs
index db5fe211..73326ab1 100644
--- a/fractal-gtk/src/main.rs
+++ b/fractal-gtk/src/main.rs
@@ -1,9 +1,10 @@
+#![deny(dead_code, unused_imports, unused_variables)]
+
 mod backend;
 mod client;
 mod config;
 mod error;
 mod globals;
-mod i18n;
 #[macro_use]
 mod util;
 mod cache;
diff --git a/fractal-gtk/src/meson.build b/fractal-gtk/src/meson.build
index cf955208..feb1696c 100644
--- a/fractal-gtk/src/meson.build
+++ b/fractal-gtk/src/meson.build
@@ -101,6 +101,8 @@ app_sources = files(
   'model/message.rs',
   'model/mod.rs',
   'model/room.rs',
+  'util/i18n.rs',
+  'util/mod.rs',
   'widgets/address.rs',
   'widgets/autocomplete.rs',
   'widgets/avatar.rs',
@@ -130,15 +132,13 @@ app_sources = files(
   'config.rs.in',
   'error.rs',
   'globals.rs',
-  'i18n.rs',
   'main.rs',
   'passwd.rs',
   'static_resources.rs',
   'static_resources.rs.in',
   'types.rs',
   'uibuilder.rs',
-  'uitypes.rs',
-  'util.rs'
+  'uitypes.rs'
 )
 
 cargo_release = custom_target('cargo-build',
diff --git a/fractal-gtk/src/model/room.rs b/fractal-gtk/src/model/room.rs
index 222f7364..807fb8ab 100644
--- a/fractal-gtk/src/model/room.rs
+++ b/fractal-gtk/src/model/room.rs
@@ -26,6 +26,7 @@ pub enum RoomMembership {
     Left(Reason),
 }
 
+// This needs to opt-out of the lint to keep consistency
 #[allow(dead_code)]
 impl RoomMembership {
     pub fn is_joined(&self) -> bool {
diff --git a/fractal-gtk/src/uibuilder.rs b/fractal-gtk/src/uibuilder.rs
index 34d7adfd..6f520ad2 100644
--- a/fractal-gtk/src/uibuilder.rs
+++ b/fractal-gtk/src/uibuilder.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::widgets::SVEntry;
 use gtk::{self, prelude::*};
 
diff --git a/fractal-gtk/src/uitypes.rs b/fractal-gtk/src/uitypes.rs
index 8721c05a..0ecdfc18 100644
--- a/fractal-gtk/src/uitypes.rs
+++ b/fractal-gtk/src/uitypes.rs
@@ -36,8 +36,6 @@ pub struct MessageContent {
 /* To-Do: this should be moved to a file collecting all structs used in the UI */
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum RowType {
-    #[allow(dead_code)]
-    Divider,
     Mention,
     Emote,
     Message,
diff --git a/fractal-gtk/src/i18n.rs b/fractal-gtk/src/util/i18n.rs
similarity index 100%
rename from fractal-gtk/src/i18n.rs
rename to fractal-gtk/src/util/i18n.rs
diff --git a/fractal-gtk/src/util.rs b/fractal-gtk/src/util/mod.rs
similarity index 98%
rename from fractal-gtk/src/util.rs
rename to fractal-gtk/src/util/mod.rs
index b2feb12c..a621bd09 100644
--- a/fractal-gtk/src/util.rs
+++ b/fractal-gtk/src/util/mod.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 use crate::globals::CACHE_PATH;
 use anyhow::anyhow;
 use anyhow::Error as AnyhowError;
@@ -11,6 +13,8 @@ use std::io::Error as IoError;
 use std::path::PathBuf;
 use std::sync::mpsc::SendError;
 
+pub mod i18n;
+
 pub fn cache_dir_path(dir: Option<&str>, name: &str) -> Result<PathBuf, IoError> {
     let path = CACHE_PATH.join(dir.unwrap_or_default());
 
diff --git a/fractal-gtk/src/widgets/file_dialog.rs b/fractal-gtk/src/widgets/file_dialog.rs
index 2cccb288..dc225865 100644
--- a/fractal-gtk/src/widgets/file_dialog.rs
+++ b/fractal-gtk/src/widgets/file_dialog.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use gtk::prelude::*;
 use gtk::ResponseType;
 use std::path::PathBuf;
diff --git a/fractal-gtk/src/widgets/image.rs b/fractal-gtk/src/widgets/image.rs
index 591b11f8..35252573 100644
--- a/fractal-gtk/src/widgets/image.rs
+++ b/fractal-gtk/src/widgets/image.rs
@@ -95,24 +95,6 @@ impl Image {
         self
     }
 
-    #[allow(dead_code)]
-    pub fn fixed(mut self, f: bool) -> Image {
-        self.fixed_size = f;
-        self
-    }
-
-    #[allow(dead_code)]
-    pub fn circle(mut self, c: bool) -> Image {
-        self.circle = c;
-        self
-    }
-
-    #[allow(dead_code)]
-    pub fn thumb(mut self, t: bool) -> Image {
-        self.thumb = t;
-        self
-    }
-
     pub fn size(mut self, size: Option<(i32, i32)>) -> Image {
         self.max_size = size;
         self
diff --git a/fractal-gtk/src/widgets/inline_player.rs b/fractal-gtk/src/widgets/inline_player.rs
index 1e183fb1..0c77981c 100644
--- a/fractal-gtk/src/widgets/inline_player.rs
+++ b/fractal-gtk/src/widgets/inline_player.rs
@@ -47,7 +47,7 @@ use std::sync::mpsc::{Receiver, Sender};
 use fractal_api::url::Url;
 
 use crate::app::App;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 pub trait PlayerExt {
     fn play(&self);
diff --git a/fractal-gtk/src/widgets/kicked_dialog.rs b/fractal-gtk/src/widgets/kicked_dialog.rs
index e89b02cb..9a315e88 100644
--- a/fractal-gtk/src/widgets/kicked_dialog.rs
+++ b/fractal-gtk/src/widgets/kicked_dialog.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n_f;
+use crate::util::i18n::i18n_f;
 use glib::clone;
 use gtk::prelude::*;
 
diff --git a/fractal-gtk/src/widgets/login.rs b/fractal-gtk/src/widgets/login.rs
index 514ffe36..f9b22f89 100644
--- a/fractal-gtk/src/widgets/login.rs
+++ b/fractal-gtk/src/widgets/login.rs
@@ -9,7 +9,7 @@ use crate::actions::global::AppState;
 use crate::actions::login::LoginState;
 use crate::appop::AppOp;
 use crate::globals;
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use crate::widgets::ErrorDialog;
 
 use crate::backend::register::get_well_known;
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index abb7b137..b1475b01 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -8,7 +8,7 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;
 
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use either::Either;
 use fractal_api::identifiers::UserId;
 use fractal_api::url::Url;
diff --git a/fractal-gtk/src/widgets/members_list.rs b/fractal-gtk/src/widgets/members_list.rs
index bb65479f..27d40433 100644
--- a/fractal-gtk/src/widgets/members_list.rs
+++ b/fractal-gtk/src/widgets/members_list.rs
@@ -7,8 +7,8 @@ use std::rc::Rc;
 use glib::signal;
 use gtk::prelude::*;
 
-use crate::i18n::i18n;
 use crate::types::Member;
+use crate::util::i18n::i18n;
 use crate::widgets;
 use crate::widgets::avatar::{AvatarBadgeColor, AvatarExt};
 
@@ -56,25 +56,6 @@ impl MembersList {
         Some(b)
     }
 
-    /* removes the content of the row with index i */
-    #[allow(dead_code)]
-    pub fn update(&self, uid: UserId) -> Option<()> {
-        let mut index = None;
-        for (i, member) in self.members.iter().enumerate() {
-            if member.uid == uid {
-                index = Some(i);
-                break;
-            }
-        }
-        let widget = self.container.get_row_at_index(index? as i32)?;
-        let child = widget.get_child()?;
-        widget.remove(&child);
-        /* We don't need to create a new widget because the draw signal
-         * will handle the creation */
-
-        None
-    }
-
     pub fn connect(&self) {
         let container = self.container.clone();
         let members = self.members.clone();
diff --git a/fractal-gtk/src/widgets/message.rs b/fractal-gtk/src/widgets/message.rs
index 274d514a..084e16e9 100644
--- a/fractal-gtk/src/widgets/message.rs
+++ b/fractal-gtk/src/widgets/message.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use itertools::Itertools;
 
 use crate::appop::UserInfoCache;
diff --git a/fractal-gtk/src/widgets/room.rs b/fractal-gtk/src/widgets/room.rs
index ebb8ae64..0bf4267f 100644
--- a/fractal-gtk/src/widgets/room.rs
+++ b/fractal-gtk/src/widgets/room.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 
 use crate::backend::room;
 use gtk::prelude::*;
diff --git a/fractal-gtk/src/widgets/room_history.rs b/fractal-gtk/src/widgets/room_history.rs
index 6c1c68e9..951a992e 100644
--- a/fractal-gtk/src/widgets/room_history.rs
+++ b/fractal-gtk/src/widgets/room_history.rs
@@ -9,9 +9,9 @@ use std::collections::VecDeque;
 use std::rc::Rc;
 
 use crate::appop::{AppOp, UserInfoCache};
-use crate::i18n::i18n;
 use crate::uitypes::MessageContent;
 use crate::uitypes::RowType;
+use crate::util::i18n::i18n;
 
 use crate::backend::ThreadPool;
 use crate::globals;
diff --git a/fractal-gtk/src/widgets/room_settings.rs b/fractal-gtk/src/widgets/room_settings.rs
index d0d8ee2e..681454cb 100644
--- a/fractal-gtk/src/widgets/room_settings.rs
+++ b/fractal-gtk/src/widgets/room_settings.rs
@@ -6,7 +6,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::thread;
 
-use crate::i18n::ni18n_f;
+use crate::util::i18n::ni18n_f;
 use fractal_api::url::Url;
 use gio::prelude::*;
 use gtk::prelude::*;
@@ -97,12 +97,6 @@ impl RoomSettings {
         Some((body, header))
     }
 
-    #[allow(dead_code)]
-    pub fn update_members_list(&self, uid: UserId) -> Option<()> {
-        self.members_list.clone()?.update(uid);
-        None
-    }
-
     pub fn connect(&mut self) {
         let name_btn = self
             .builder
diff --git a/fractal-gtk/src/widgets/roomlist.rs b/fractal-gtk/src/widgets/roomlist.rs
index c5ba4e31..09c8a843 100644
--- a/fractal-gtk/src/widgets/roomlist.rs
+++ b/fractal-gtk/src/widgets/roomlist.rs
@@ -1,4 +1,4 @@
-use crate::i18n::i18n;
+use crate::util::i18n::i18n;
 use fractal_api::identifiers::RoomId;
 use glib::clone;
 
diff --git a/fractal-gtk/src/widgets/scroll_widget.rs b/fractal-gtk/src/widgets/scroll_widget.rs
index 8f9bbc12..8bf6d37c 100644
--- a/fractal-gtk/src/widgets/scroll_widget.rs
+++ b/fractal-gtk/src/widgets/scroll_widget.rs
@@ -10,6 +10,7 @@ use gtk::prelude::*;
 
 use libhandy::ColumnExt;
 
+// This really requires to opt-out of the lint
 #[allow(dead_code)]
 #[derive(Debug, Clone, PartialEq)]
 enum Position {
@@ -17,10 +18,8 @@ enum Position {
     Bottom,
 }
 
-#[allow(dead_code)]
 pub struct ScrollWidget {
     upper: Rc<Cell<f64>>,
-    value: Rc<Cell<f64>>, // FIXME: is it really used anywhere?
     balance: Rc<Cell<Option<Position>>>,
     autoscroll: Rc<Cell<bool>>,
     /* whether a request for more messages has been send or not */
@@ -127,15 +126,9 @@ impl ScrollWidget {
             .get_vadjustment()
             .map(|adj| adj.get_upper())
             .unwrap_or_default();
-        let value = widgets
-            .view
-            .get_vadjustment()
-            .map(|adj| adj.get_value())
-            .unwrap_or_default();
 
         let mut scroll = ScrollWidget {
             widgets,
-            value: Rc::new(Cell::new(value)),
             upper: Rc::new(Cell::new(upper)),
             autoscroll: Rc::new(Cell::new(false)),
             request_sent: Rc::new(Cell::new(false)),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]