Fix deprecation warnings

src/controllers/settings_controller.rs

@@ -10,8 +10,6 @@ use crate::data::current_user::CurrentUser;
 use crate::data::remote_ip::RemoteIP;
 use crate::data::user::User;
 
-#[derive(Template)]
-#[template(path = "settings/base_settings_page.html")]
 pub(crate) struct BaseSettingsPage {
     pub danger_message: Option<String>,
     pub success_message: Option<String>,
@@ -23,7 +21,7 @@ pub(crate) struct BaseSettingsPage {
 
 impl BaseSettingsPage {
     pub fn get(page_title: &'static str, user: &User,
-                 danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
+               danger_message: Option<String>, success_message: Option<String>) -> BaseSettingsPage {
         Self {
             danger_message,
             success_message,
@@ -38,18 +36,14 @@ impl BaseSettingsPage {
 #[derive(Template)]
 #[template(path = "settings/account_details.html")]
 struct AccountDetailsPage {
-    _parent: BaseSettingsPage,
-    user_id: String,
-    first_name: String,
-    last_name: String,
-    username: String,
-    email: String,
+    _p: BaseSettingsPage,
+    u: User,
 }
 
 #[derive(Template)]
 #[template(path = "settings/change_password.html")]
 struct ChangePasswordPage {
-    _parent: BaseSettingsPage,
+    _p: BaseSettingsPage,
     min_pwd_len: usize,
 }
 
@@ -58,12 +52,8 @@ pub async fn account_settings_details_route(user: CurrentUser) -> impl Responder
     let user = user.into();
     HttpResponse::Ok()
         .body(AccountDetailsPage {
-            _parent: BaseSettingsPage::get("Account details", &user, None, None),
-            user_id: user.uid,
-            first_name: user.first_name,
-            last_name: user.last_name,
-            username: user.username,
-            email: user.email,
+            _p: BaseSettingsPage::get("Account details", &user, None, None),
+            u: user,
         }.render().unwrap())
 }
 
@@ -121,7 +111,7 @@ pub async fn change_password_route(user: CurrentUser,
 
     HttpResponse::Ok()
         .body(ChangePasswordPage {
-            _parent: BaseSettingsPage::get("Change password", &user, danger, success),
+            _p: BaseSettingsPage::get("Change password", &user, danger, success),
             min_pwd_len: MIN_PASS_LEN,
         }.render().unwrap())
 }