Browse Source

chore: Switch to Rust 2021 edition

Part-of: <https://gitlab.gnome.org/GNOME/fractal/-/merge_requests/1176>
merge-requests/1327/merge
Kévin Commaille 3 years ago committed by Marge Bot
parent
commit
6203ba01b3
  1. 2
      Cargo.toml
  2. 1
      src/contrib/qr_code.rs
  3. 2
      src/login/idp_button.rs
  4. 2
      src/session/content/explore/public_room_list.rs
  5. 2
      src/session/content/room_details/member_page/mod.rs
  6. 2
      src/session/mod.rs
  7. 2
      src/session/room/room_type.rs
  8. 2
      src/session/sidebar/category.rs
  9. 5
      src/session/sidebar/mod.rs
  10. 2
      src/session/sidebar/row.rs
  11. 2
      src/utils.rs

2
Cargo.toml

@ -2,7 +2,7 @@
name = "fractal"
version = "5.0.0-alpha1"
authors = ["Julian Sparber <julian@sparber.net>"]
edition = "2018"
edition = "2021"
rust-version = "1.60"
[profile.release]

1
src/contrib/qr_code.rs

@ -1,6 +1,5 @@
// Taken from https://gitlab.gnome.org/msandova/trinket/-/blob/master/src/qr_code.rs
// All credit goes to Maximiliano
use std::convert::TryFrom;
use gtk::{glib, prelude::*, subclass::prelude::*};

2
src/login/idp_button.rs

@ -1,5 +1,3 @@
use std::convert::{TryFrom, TryInto};
use gtk::{self, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
use matrix_sdk::ruma::api::client::session::get_login_types::v3::{
IdentityProvider, IdentityProviderBrand,

2
src/session/content/explore/public_room_list.rs

@ -1,5 +1,3 @@
use std::convert::TryFrom;
use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*};
use log::error;
use matrix_sdk::ruma::{

2
src/session/content/room_details/member_page/mod.rs

@ -71,8 +71,6 @@ mod imp {
});
klass.install_action("members.subpage", Some("u"), move |widget, _, param| {
use std::convert::TryFrom;
let state = param
.and_then(|variant| variant.get::<u32>())
.and_then(|u| Membership::try_from(u).ok());

2
src/session/mod.rs

@ -10,7 +10,7 @@ mod sidebar;
mod user;
pub mod verification;
use std::{collections::HashSet, convert::TryFrom, fs, path::PathBuf, time::Duration};
use std::{collections::HashSet, fs, path::PathBuf, time::Duration};
use adw::subclass::prelude::BinImpl;
use futures::StreamExt;

2
src/session/room/room_type.rs

@ -1,4 +1,4 @@
use std::{convert::TryFrom, fmt};
use std::fmt;
use gtk::glib;
use num_enum::{IntoPrimitive, TryFromPrimitive};

2
src/session/sidebar/category.rs

@ -7,7 +7,7 @@ use crate::session::{
};
mod imp {
use std::{cell::Cell, convert::TryFrom};
use std::cell::Cell;
use once_cell::unsync::OnceCell;

5
src/session/sidebar/mod.rs

@ -42,10 +42,7 @@ use crate::{
};
mod imp {
use std::{
cell::{Cell, RefCell},
convert::TryFrom,
};
use std::cell::{Cell, RefCell};
use glib::{signal::SignalHandlerId, subclass::InitializingObject};
use once_cell::{sync::Lazy, unsync::OnceCell};

2
src/session/sidebar/row.rs

@ -1,5 +1,3 @@
use std::convert::TryFrom;
use adw::{prelude::*, subclass::prelude::*};
use gtk::{gdk, glib, glib::clone};

2
src/utils.rs

@ -166,7 +166,7 @@ macro_rules! _add_toast {
}};
}
use std::{convert::TryInto, path::PathBuf, str::FromStr};
use std::{path::PathBuf, str::FromStr};
use gettextrs::gettext;
use gtk::{

Loading…
Cancel
Save