Browse Source

chore: Fix clippy nightly warnings

merge-requests/1327/merge
Kévin Commaille 3 years ago
parent
commit
fc49b657e7
No known key found for this signature in database
GPG Key ID: DD507DAE96E8245C
  1. 6
      src/application.rs
  2. 2
      src/components/auth_dialog.rs
  3. 2
      src/components/label_with_widgets.rs
  4. 2
      src/components/media_content_viewer.rs
  5. 2
      src/login/idp_button.rs
  6. 2
      src/session/account_settings/devices_page/device_row.rs
  7. 2
      src/session/account_settings/mod.rs
  8. 16
      src/session/content/explore/server.rs
  9. 4
      src/session/content/room_details/invite_subpage/invitee.rs
  10. 2
      src/session/content/room_details/member_page/members_list_view/membership_subpage_item.rs
  11. 6
      src/session/content/room_history/attachment_dialog.rs
  12. 2
      src/session/room/member.rs
  13. 2
      src/session/room/reaction_group.rs
  14. 2
      src/session/room/timeline/mod.rs
  15. 4
      src/session/room/timeline/timeline_placeholder.rs
  16. 2
      src/session/room_creation/mod.rs
  17. 2
      src/session/settings.rs
  18. 2
      src/session/sidebar/category.rs
  19. 2
      src/session/sidebar/category_row.rs
  20. 2
      src/session/sidebar/entry.rs
  21. 2
      src/session/user.rs
  22. 12
      src/session/verification/identity_verification.rs
  23. 6
      src/window.rs

6
src/application.rs

@ -92,9 +92,9 @@ glib::wrapper! {
impl Application {
pub fn new() -> Self {
glib::Object::builder()
.property("application-id", &Some(config::APP_ID))
.property("flags", &ApplicationFlags::default())
.property("resource-base-path", &Some("/org/gnome/Fractal/"))
.property("application-id", Some(config::APP_ID))
.property("flags", ApplicationFlags::default())
.property("resource-base-path", Some("/org/gnome/Fractal/"))
.build()
}

2
src/components/auth_dialog.rs

@ -157,7 +157,7 @@ glib::wrapper! {
impl AuthDialog {
pub fn new(transient_for: Option<&impl IsA<gtk::Window>>, session: &Session) -> Self {
glib::Object::builder()
.property("transient-for", &transient_for)
.property("transient-for", transient_for)
.property("session", session)
.build()
}

2
src/components/label_with_widgets.rs

@ -176,7 +176,7 @@ impl LabelWithWidgets {
/// Create a `LabelWithWidget` with the given label and widgets.
pub fn with_label_and_widgets<P: IsA<gtk::Widget>>(label: &str, widgets: Vec<P>) -> Self {
let obj: Self = glib::Object::builder().property("label", &label).build();
let obj: Self = glib::Object::builder().property("label", label).build();
// FIXME: use a property for widgets
obj.set_widgets(widgets);
obj

2
src/components/media_content_viewer.rs

@ -114,7 +114,7 @@ glib::wrapper! {
impl MediaContentViewer {
pub fn new(autoplay: bool) -> Self {
glib::Object::builder()
.property("autoplay", &autoplay)
.property("autoplay", autoplay)
.build()
}

2
src/login/idp_button.rs

@ -207,7 +207,7 @@ impl IdpButton {
Some(
glib::Object::builder()
.property("brand", &gidp)
.property("brand", gidp)
.property("id", &idp.id)
.build(),
)

2
src/session/account_settings/devices_page/device_row.rs

@ -133,7 +133,7 @@ impl DeviceRow {
pub fn new(device: &Device, is_current_device: bool) -> Self {
glib::Object::builder()
.property("device", device)
.property("is-current-device", &is_current_device)
.property("is-current-device", is_current_device)
.build()
}

2
src/session/account_settings/mod.rs

@ -126,7 +126,7 @@ glib::wrapper! {
impl AccountSettings {
pub fn new(parent_window: Option<&impl IsA<gtk::Window>>, session: &Session) -> Self {
glib::Object::builder()
.property("transient-for", &parent_window)
.property("transient-for", parent_window)
.property("session", session)
.build()
}

16
src/session/content/explore/server.rs

@ -84,9 +84,9 @@ glib::wrapper! {
impl Server {
pub fn with_default_server(name: &str) -> Self {
glib::Object::builder()
.property("name", &name)
.property("network", &"matrix")
.property("deletable", &false)
.property("name", name)
.property("network", "matrix")
.property("deletable", false)
.build()
}
@ -95,16 +95,16 @@ impl Server {
glib::Object::builder()
.property("name", &name)
.property("network", &instance.instance_id)
.property("deletable", &false)
.property("deletable", false)
.build()
}
pub fn with_custom_matrix_server(server: &str) -> Self {
glib::Object::builder()
.property("name", &server)
.property("network", &"matrix")
.property("server", &server)
.property("deletable", &true)
.property("name", server)
.property("network", "matrix")
.property("server", server)
.property("deletable", true)
.build()
}

4
src/session/content/room_details/invite_subpage/invitee.rs

@ -81,8 +81,8 @@ impl Invitee {
) -> Self {
let obj: Self = glib::Object::builder()
.property("session", session)
.property("user-id", &user_id.as_str())
.property("display-name", &display_name)
.property("user-id", user_id.as_str())
.property("display-name", display_name)
.build();
// FIXME: we should make the avatar_url settable as property
obj.set_avatar_url(avatar_url.map(std::borrow::ToOwned::to_owned));

2
src/session/content/room_details/member_page/members_list_view/membership_subpage_item.rs

@ -69,7 +69,7 @@ glib::wrapper! {
impl MembershipSubpageItem {
pub fn new(state: Membership, model: &impl IsA<gio::ListModel>) -> Self {
glib::Object::builder()
.property("state", &state)
.property("state", state)
.property("model", model)
.build()
}

6
src/session/content/room_history/attachment_dialog.rs

@ -59,7 +59,7 @@ impl AttachmentDialog {
pub fn for_image(transient_for: &gtk::Window, title: &str, image: &gdk::Texture) -> Self {
let obj: Self = glib::Object::builder()
.property("transient-for", transient_for)
.property("title", &title)
.property("title", title)
.build();
obj.imp().media.view_image(image);
obj.imp().send_button.grab_focus();
@ -69,7 +69,7 @@ impl AttachmentDialog {
pub fn for_file(transient_for: &gtk::Window, title: &str, file: &gio::File) -> Self {
let obj: Self = glib::Object::builder()
.property("transient-for", transient_for)
.property("title", &title)
.property("title", title)
.build();
obj.imp().media.view_file(file.to_owned());
obj.imp().send_button.grab_focus();
@ -83,7 +83,7 @@ impl AttachmentDialog {
) -> Self {
let obj: Self = glib::Object::builder()
.property("transient-for", transient_for)
.property("title", &title)
.property("title", title)
.build();
obj.imp().media.view_location(geo_uri);
obj.imp().send_button.grab_focus();

2
src/session/room/member.rs

@ -144,7 +144,7 @@ impl Member {
let session = room.session();
glib::Object::builder()
.property("session", &session)
.property("user-id", &user_id.as_str())
.property("user-id", user_id.as_str())
.build()
}

2
src/session/room/reaction_group.rs

@ -83,7 +83,7 @@ glib::wrapper! {
impl ReactionGroup {
pub fn new(key: &str, user: &User) -> Self {
glib::Object::builder()
.property("key", &key)
.property("key", key)
.property("user", user)
.build()
}

2
src/session/room/timeline/mod.rs

@ -147,7 +147,7 @@ glib::wrapper! {
impl Timeline {
pub fn new(room: &Room) -> Self {
glib::Object::builder().property("room", &room).build()
glib::Object::builder().property("room", room).build()
}
/// The number of visible items in the list.

4
src/session/room/timeline/timeline_placeholder.rs

@ -73,13 +73,13 @@ impl TimelinePlaceholder {
pub fn typing() -> Self {
glib::Object::builder()
.property("kind", &PlaceholderKind::Typing)
.property("kind", PlaceholderKind::Typing)
.build()
}
pub fn timeline_start() -> Self {
glib::Object::builder()
.property("kind", &PlaceholderKind::TimelineStart)
.property("kind", PlaceholderKind::TimelineStart)
.build()
}

2
src/session/room_creation/mod.rs

@ -148,7 +148,7 @@ glib::wrapper! {
impl RoomCreation {
pub fn new(parent_window: Option<&impl IsA<gtk::Window>>, session: &Session) -> Self {
glib::Object::builder()
.property("transient-for", &parent_window)
.property("transient-for", parent_window)
.property("session", session)
.build()
}

2
src/session/settings.rs

@ -103,7 +103,7 @@ glib::wrapper! {
impl SessionSettings {
pub fn new(session_id: &str) -> Self {
glib::Object::builder()
.property("session-id", &session_id)
.property("session-id", session_id)
.build()
}

2
src/session/sidebar/category.rs

@ -115,7 +115,7 @@ glib::wrapper! {
impl Category {
pub fn new(type_: CategoryType, model: &impl IsA<gio::ListModel>) -> Self {
glib::Object::builder()
.property("type", &type_)
.property("type", type_)
.property("model", model)
.build()
}

2
src/session/sidebar/category_row.rs

@ -100,7 +100,7 @@ glib::wrapper! {
impl CategoryRow {
pub fn new() -> Self {
glib::Object::builder()
.property("show-label-for-category", &CategoryType::None)
.property("show-label-for-category", CategoryType::None)
.build()
}

2
src/session/sidebar/entry.rs

@ -82,7 +82,7 @@ glib::wrapper! {
impl Entry {
pub fn new(type_: EntryType) -> Self {
glib::Object::builder().property("type", &type_).build()
glib::Object::builder().property("type", type_).build()
}
/// The type of this entry.

2
src/session/user.rs

@ -130,7 +130,7 @@ impl User {
pub fn new(session: &Session, user_id: &UserId) -> Self {
glib::Object::builder()
.property("session", session)
.property("user-id", &user_id.as_str())
.property("user-id", user_id.as_str())
.build()
}

12
src/session/verification/identity_verification.rs

@ -316,7 +316,7 @@ glib::wrapper! {
impl IdentityVerification {
fn for_error(session: &Session, user: &User, start_time: &glib::DateTime) -> Self {
glib::Object::builder()
.property("state", &State::Error)
.property("state", State::Error)
.property("session", session)
.property("user", user)
.property("start-time", start_time)
@ -331,10 +331,10 @@ impl IdentityVerification {
start_time: &glib::DateTime,
) -> Self {
glib::Object::builder()
.property("flow-id", &flow_id)
.property("flow-id", flow_id)
.property("session", session)
.property("user", user)
.property("supported-methods", &SupportedMethods::with_camera(true))
.property("supported-methods", SupportedMethods::with_camera(true))
.property("start-time", start_time)
.build()
}
@ -366,9 +366,9 @@ impl IdentityVerification {
match handle.await.unwrap() {
Ok(request) => {
let obj = glib::Object::builder()
.property("state", &State::RequestSend)
.property("supported-methods", &supported_methods)
.property("flow-id", &request.flow_id())
.property("state", State::RequestSend)
.property("supported-methods", supported_methods)
.property("flow-id", request.flow_id())
.property("session", session)
.property("user", user)
.property("start-time", &glib::DateTime::now_local().unwrap())

6
src/window.rs

@ -173,8 +173,8 @@ glib::wrapper! {
impl Window {
pub fn new(app: &Application) -> Self {
glib::Object::builder()
.property("application", &Some(app))
.property("icon-name", &Some(APP_ID))
.property("application", Some(app))
.property("icon-name", Some(APP_ID))
.build()
}
@ -326,7 +326,7 @@ impl Window {
let is_maximized = settings.boolean("is-maximized");
self.set_default_size(width, height);
self.set_property("maximized", &is_maximized);
self.set_property("maximized", is_maximized);
}
/// Change the default widget of the window based on the visible child.

Loading…
Cancel
Save