Update book to 0.6

Hofer-Julian · sdroege · commit 95b18e535134 · 2023-02-12T13:21:16.000+02:00
diff --git a/book/listings/Cargo.toml b/book/listings/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 gtk = { version = "*", package = "gtk4", features = ["v4_8"] }
-adw = { version = "0.2.0-alpha.2", package = "libadwaita" }
+adw = { version = "*", package = "libadwaita" }
 once_cell = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/book/listings/actions/3/main.rs b/book/listings/actions/3/main.rs
@@ -62,7 +62,7 @@ fn build_ui(app: &Application) {
     let action_count = SimpleAction::new_stateful(
         "count",
         Some(&i32::static_variant_type()),
-        &original_state.to_variant(),
+        original_state.to_variant(),
     );
     action_count.connect_activate(clone!(@weak label => move |action, parameter| {
         // Get state
@@ -80,7 +80,7 @@ fn build_ui(app: &Application) {
 
         // Increase state by parameter and store state
         state += parameter;
-        action.set_state(&state.to_variant());
+        action.set_state(state.to_variant());
 
         // Update label with new state
         label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/4/main.rs b/book/listings/actions/4/main.rs
@@ -58,7 +58,7 @@ fn build_ui(app: &Application) {
     let action_count = SimpleAction::new_stateful(
         "count",
         Some(&i32::static_variant_type()),
-        &original_state.to_variant(),
+        original_state.to_variant(),
     );
     action_count.connect_activate(clone!(@weak label => move |action, parameter| {
         // Get state
@@ -76,7 +76,7 @@ fn build_ui(app: &Application) {
 
         // Increase state by parameter and save state
         state += parameter;
-        action.set_state(&state.to_variant());
+        action.set_state(state.to_variant());
 
         // Update label with new state
         label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/5/window/mod.rs b/book/listings/actions/5/window/mod.rs
@@ -28,7 +28,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            &original_state.to_variant(),
+            original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -47,7 +47,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(&state.to_variant());
+            action.set_state(state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/actions/6/window/mod.rs b/book/listings/actions/6/window/mod.rs
@@ -29,7 +29,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            &original_state.to_variant(),
+            original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -48,7 +48,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(&state.to_variant());
+            action.set_state(state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
@@ -70,7 +70,7 @@ impl Window {
         let action_orientation = SimpleAction::new_stateful(
             "orientation",
             Some(&String::static_variant_type()),
-            &"Vertical".to_variant(),
+            "Vertical".to_variant(),
         );
 
         action_orientation.connect_activate(clone!(@weak gtk_box =>
@@ -89,7 +89,7 @@ impl Window {
 
                 // Set orientation and save state
                 gtk_box.set_orientation(orientation);
-                action.set_state(&parameter.to_variant());
+                action.set_state(parameter.to_variant());
         }));
         self.add_action(&action_orientation);
         //ANCHOR_END: action_orientation
diff --git a/book/listings/actions/7/window/mod.rs b/book/listings/actions/7/window/mod.rs
@@ -47,7 +47,7 @@ impl Window {
         let action_count = SimpleAction::new_stateful(
             "count",
             Some(&i32::static_variant_type()),
-            &original_state.to_variant(),
+            original_state.to_variant(),
         );
 
         action_count.connect_activate(clone!(@weak label => move |action, parameter| {
@@ -66,7 +66,7 @@ impl Window {
 
             // Increase state by parameter and save state
             state += parameter;
-            action.set_state(&state.to_variant());
+            action.set_state(state.to_variant());
 
             // Update label with new state
             label.set_label(&format!("Counter: {state}"));
diff --git a/book/listings/css/1/main.rs b/book/listings/css/1/main.rs
@@ -20,7 +20,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/2/main.rs b/book/listings/css/2/main.rs
@@ -19,7 +19,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/3/main.rs b/book/listings/css/3/main.rs
@@ -19,7 +19,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/4/main.rs b/book/listings/css/4/main.rs
@@ -19,7 +19,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/7/main.rs b/book/listings/css/7/main.rs
@@ -23,7 +23,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/8/main.rs b/book/listings/css/8/main.rs
@@ -23,7 +23,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/css/9/main.rs b/book/listings/css/9/main.rs
@@ -23,7 +23,7 @@ fn main() {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_bytes!("style.css"));
+    provider.load_from_data(include_str!("style.css"));
 
     // Add the provider to the default screen
     StyleContext::add_provider_for_display(
diff --git a/book/listings/list_widgets/2/main.rs b/book/listings/list_widgets/2/main.rs
@@ -71,8 +71,8 @@ fn build_ui(app: &Application) {
     // ANCHOR_END: factory_bind
 
     // ANCHOR: selection_list
-    let selection_model = SingleSelection::new(Some(&model));
-    let list_view = ListView::new(Some(&selection_model), Some(&factory));
+    let selection_model = SingleSelection::new(Some(model));
+    let list_view = ListView::new(Some(selection_model), Some(factory));
     // ANCHOR_END: selection_list
 
     // ANCHOR: scrolled_window
diff --git a/book/listings/list_widgets/3/main.rs b/book/listings/list_widgets/3/main.rs
@@ -67,8 +67,8 @@ fn build_ui(app: &Application) {
     });
     // ANCHOR_END: factory_bind
 
-    let selection_model = SingleSelection::new(Some(&model));
-    let list_view = ListView::new(Some(&selection_model), Some(&factory));
+    let selection_model = SingleSelection::new(Some(model));
+    let list_view = ListView::new(Some(selection_model), Some(factory));
 
     // ANCHOR: list_view_activate
     list_view.connect_activate(move |list_view, position| {
diff --git a/book/listings/list_widgets/4/main.rs b/book/listings/list_widgets/4/main.rs
@@ -49,8 +49,8 @@ fn build_ui(app: &Application) {
     });
     // ANCHOR_END: factory_setup
 
-    let selection_model = SingleSelection::new(Some(&model));
-    let list_view = ListView::new(Some(&selection_model), Some(&factory));
+    let selection_model = SingleSelection::new(Some(model));
+    let list_view = ListView::new(Some(selection_model), Some(factory));
 
     list_view.connect_activate(move |list_view, position| {
         // Get `IntegerObject` from model
diff --git a/book/listings/list_widgets/5/main.rs b/book/listings/list_widgets/5/main.rs
@@ -63,7 +63,7 @@ fn build_ui(app: &Application) {
         // Only allow even numbers
         number % 2 == 0
     });
-    let filter_model = FilterListModel::new(Some(&model), Some(&filter));
+    let filter_model = FilterListModel::new(Some(model), Some(filter.clone()));
     // ANCHOR_END: filter
 
     // ANCHOR: sorter
@@ -83,11 +83,11 @@ fn build_ui(app: &Application) {
         // Reverse sorting order -> large numbers come first
         number_2.cmp(&number_1).into()
     });
-    let sort_model = SortListModel::new(Some(&filter_model), Some(&sorter));
+    let sort_model = SortListModel::new(Some(filter_model), Some(sorter.clone()));
     // ANCHOR_END: sorter
 
-    let selection_model = SingleSelection::new(Some(&sort_model));
-    let list_view = ListView::new(Some(&selection_model), Some(&factory));
+    let selection_model = SingleSelection::new(Some(sort_model));
+    let list_view = ListView::new(Some(selection_model), Some(factory));
 
     // ANCHOR: activate
     list_view.connect_activate(move |list_view, position| {
diff --git a/book/listings/list_widgets/6/main.rs b/book/listings/list_widgets/6/main.rs
@@ -45,8 +45,8 @@ fn build_ui(app: &Application) {
     });
     // ANCHOR_END: factory_setup
 
-    let selection_model = NoSelection::new(Some(&model));
-    let list_view = ListView::new(Some(&selection_model), Some(&factory));
+    let selection_model = NoSelection::new(Some(model));
+    let list_view = ListView::new(Some(selection_model), Some(factory));
 
     let scrolled_window = ScrolledWindow::builder()
         .hscrollbar_policy(PolicyType::Never) // Disable horizontal scrolling
diff --git a/book/listings/todo/1/window/mod.rs b/book/listings/todo/1/window/mod.rs
@@ -41,7 +41,7 @@ impl Window {
         self.imp().tasks.replace(Some(model));
 
         // Wrap model with selection and pass it to the list view
-        let selection_model = NoSelection::new(Some(&self.tasks()));
+        let selection_model = NoSelection::new(Some(self.tasks()));
         self.imp().tasks_list.set_model(Some(&selection_model));
     }
     // ANCHOR_END: tasks
@@ -68,7 +68,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/2/window/mod.rs b/book/listings/todo/2/window/mod.rs
@@ -101,9 +101,8 @@ impl Window {
         self.imp().tasks.replace(Some(model));
 
         // Wrap model with filter and selection and pass it to the list view
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.set_model(Some(&selection_model));
 
         // Filter model whenever the value of the key "filter" changes
@@ -157,7 +156,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/3/window/mod.rs b/book/listings/todo/3/window/mod.rs
@@ -96,9 +96,8 @@ impl Window {
         self.imp().tasks.replace(Some(model));
 
         // Wrap model with filter and selection and pass it to the list view
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.set_model(Some(&selection_model));
 
         // Filter model whenever the value of the key "filter" changes
@@ -147,7 +146,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/4/window/mod.rs b/book/listings/todo/4/window/mod.rs
@@ -93,9 +93,8 @@ impl Window {
         self.imp().tasks.replace(Some(model));
 
         // Wrap model with filter and selection and pass it to the list view
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.set_model(Some(&selection_model));
 
         // Filter model whenever the value of the key "filter" changes
@@ -144,7 +143,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/5/window/mod.rs b/book/listings/todo/5/window/mod.rs
@@ -94,9 +94,8 @@ impl Window {
         self.imp().tasks.replace(Some(model));
 
         // Wrap model with filter and selection and pass it to the list view
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.set_model(Some(&selection_model));
 
         // Filter model whenever the value of the key "filter" changes
@@ -145,7 +144,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/6/window/mod.rs b/book/listings/todo/6/window/mod.rs
@@ -91,9 +91,8 @@ impl Window {
 
         // ANCHOR: bind_model
         // Wrap model with filter and selection and pass it to the list box
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.bind_model(
             Some(&selection_model),
             clone!(@weak self as window => @default-panic, move |obj| {
@@ -197,7 +196,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/7/window/mod.rs b/book/listings/todo/7/window/mod.rs
@@ -94,9 +94,8 @@ impl Window {
 
         // ANCHOR: bind_model
         // Wrap model with filter and selection and pass it to the list box
-        let filter_model =
-            FilterListModel::new(Some(&self.tasks()), self.filter().as_ref());
-        let selection_model = NoSelection::new(Some(&filter_model));
+        let filter_model = FilterListModel::new(Some(self.tasks()), self.filter());
+        let selection_model = NoSelection::new(Some(filter_model.clone()));
         self.imp().tasks_list.bind_model(
             Some(&selection_model),
             clone!(@weak self as window => @default-panic, move |obj| {
@@ -200,7 +199,7 @@ impl Window {
     fn new_task(&self) {
         // Get content from entry and clear it
         let buffer = self.imp().entry.buffer();
-        let content = buffer.text();
+        let content = buffer.text().to_string();
         if content.is_empty() {
             return;
         }
diff --git a/book/listings/todo/8/window/mod.rs b/book/listings/todo/8/window/mod.rs
