book: Store instances in variables more often

Hofer-Julian · Hofer-Julian · commit 92d69d70fb8c · 2022-10-20T18:31:44.000+02:00
diff --git a/book/listings/actions/7/window/imp.rs b/book/listings/actions/7/window/imp.rs
@@ -45,9 +45,10 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_actions();
-        self.instance().bind_settings();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_actions();
+        instance.bind_settings();
     }
 }
 // ANCHOR_END: object_impl
diff --git a/book/listings/g_object_properties/4/custom_button/imp.rs b/book/listings/g_object_properties/4/custom_button/imp.rs
@@ -52,8 +52,9 @@ impl ObjectImpl for CustomButton {
 
         // Bind label to number
         // `SYNC_CREATE` ensures that the label will be immediately set
-        self.instance()
-            .bind_property("number", &*self.instance(), "label")
+        let instance = self.instance();
+        instance
+            .bind_property("number", &*instance, "label")
             .flags(BindingFlags::SYNC_CREATE)
             .build();
     }
diff --git a/book/listings/g_object_signals/2/custom_button/imp.rs b/book/listings/g_object_signals/2/custom_button/imp.rs
@@ -63,8 +63,9 @@ impl ObjectImpl for CustomButton {
 
         // Bind label to number
         // `SYNC_CREATE` ensures that the label will be immediately set
-        self.instance()
-            .bind_property("number", &*self.instance(), "label")
+        let instance = self.instance();
+        instance
+            .bind_property("number", &*instance, "label")
             .flags(BindingFlags::SYNC_CREATE)
             .build();
     }
@@ -80,14 +81,14 @@ static MAX_NUMBER: i32 = 8;
 impl ButtonImpl for CustomButton {
     fn clicked(&self) {
         let incremented_number = self.number.get() + 1;
+        let instance = self.instance();
         // If `number` reached `MAX_NUMBER`,
         // emit "max-number-reached" signal and set `number` back to 0
         if incremented_number == MAX_NUMBER {
-            self.instance()
-                .emit_by_name::<()>("max-number-reached", &[&incremented_number]);
-            self.instance().set_property("number", &0);
+            instance.emit_by_name::<()>("max-number-reached", &[&incremented_number]);
+            instance.set_property("number", &0);
         } else {
-            self.instance().set_property("number", &incremented_number);
+            instance.set_property("number", &incremented_number);
         }
     }
 }
diff --git a/book/listings/saving_window_state/1/custom_window/imp.rs b/book/listings/saving_window_state/1/custom_window/imp.rs
@@ -20,8 +20,9 @@ impl ObjectImpl for Window {
     fn constructed(&self) {
         self.parent_constructed();
         // Load latest window state
-        self.instance().setup_settings();
-        self.instance().load_window_size();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.load_window_size();
     }
 }
 impl WidgetImpl for Window {}
diff --git a/book/listings/todo/1/window/imp.rs b/book/listings/todo/1/window/imp.rs
@@ -43,9 +43,10 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_tasks();
-        self.instance().setup_callbacks();
-        self.instance().setup_factory();
+        let instance = self.instance();
+        instance.setup_tasks();
+        instance.setup_callbacks();
+        instance.setup_factory();
     }
 }
 // ANCHOR_END: constructed
diff --git a/book/listings/todo/2/window/imp.rs b/book/listings/todo/2/window/imp.rs
@@ -52,12 +52,13 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_factory();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_factory();
+        instance.setup_actions();
     }
 }
 // ANCHOR_END: object_impl
diff --git a/book/listings/todo/3/window/imp.rs b/book/listings/todo/3/window/imp.rs
@@ -49,12 +49,13 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_factory();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_factory();
+        instance.setup_actions();
     }
 }
 
diff --git a/book/listings/todo/4/window/imp.rs b/book/listings/todo/4/window/imp.rs
@@ -49,12 +49,13 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_factory();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_factory();
+        instance.setup_actions();
     }
 }
 
diff --git a/book/listings/todo/5/window/imp.rs b/book/listings/todo/5/window/imp.rs
@@ -49,12 +49,13 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_factory();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_factory();
+        instance.setup_actions();
     }
 }
 
diff --git a/book/listings/todo/6/window/imp.rs b/book/listings/todo/6/window/imp.rs
@@ -52,11 +52,12 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_actions();
     }
 }
 
diff --git a/book/listings/todo/7/window/imp.rs b/book/listings/todo/7/window/imp.rs
@@ -53,11 +53,12 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_tasks();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_tasks();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_actions();
     }
 }
 
diff --git a/book/listings/todo/8/window/imp.rs b/book/listings/todo/8/window/imp.rs
@@ -67,11 +67,12 @@ impl ObjectImpl for Window {
         self.parent_constructed();
 
         // Setup
-        self.instance().setup_settings();
-        self.instance().setup_collections();
-        self.instance().restore_data();
-        self.instance().setup_callbacks();
-        self.instance().setup_actions();
+        let instance = self.instance();
+        instance.setup_settings();
+        instance.setup_collections();
+        instance.restore_data();
+        instance.setup_callbacks();
+        instance.setup_actions();
     }
 }
 // ANCHOR_END: object_impl

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,10 @@ impl ObjectImpl for Window {`
`45`	`45`	`self.parent_constructed();`
`46`	`46`
`47`	`47`	`// Setup`
`48`		`- self.instance().setup_settings();`
`49`		`- self.instance().setup_actions();`
`50`		`- self.instance().bind_settings();`
	`48`	`+ let instance = self.instance();`
	`49`	`+ instance.setup_settings();`
	`50`	`+ instance.setup_actions();`
	`51`	`+ instance.bind_settings();`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`// ANCHOR_END: object_impl`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@ impl ObjectImpl for Window {`
`20`	`20`	`fn constructed(&self) {`
`21`	`21`	`self.parent_constructed();`
`22`	`22`	`// Load latest window state`
`23`		`- self.instance().setup_settings();`
`24`		`- self.instance().load_window_size();`
	`23`	`+ let instance = self.instance();`
	`24`	`+ instance.setup_settings();`
	`25`	`+ instance.load_window_size();`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`impl WidgetImpl for Window {}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,10 @@ impl ObjectImpl for Window {`
`43`	`43`	`self.parent_constructed();`
`44`	`44`
`45`	`45`	`// Setup`
`46`		`- self.instance().setup_tasks();`
`47`		`- self.instance().setup_callbacks();`
`48`		`- self.instance().setup_factory();`
	`46`	`+ let instance = self.instance();`
	`47`	`+ instance.setup_tasks();`
	`48`	`+ instance.setup_callbacks();`
	`49`	`+ instance.setup_factory();`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`// ANCHOR_END: constructed`