Skip to content

Commit 5d77313

Browse files
Fix nightly clippy warnings
1 parent e6521c7 commit 5d77313

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

gsk4/src/transform.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl Transform {
4242
unsafe {
4343
let res: Option<Self> =
4444
from_glib_full(ffi::gsk_transform_rotate(self.into_glib_ptr(), angle));
45-
res.unwrap_or_else(Self::new)
45+
res.unwrap_or_default()
4646
}
4747
}
4848

@@ -55,7 +55,7 @@ impl Transform {
5555
angle,
5656
axis.to_glib_none().0,
5757
));
58-
res.unwrap_or_else(Self::new)
58+
res.unwrap_or_default()
5959
}
6060
}
6161

@@ -68,7 +68,7 @@ impl Transform {
6868
factor_x,
6969
factor_y,
7070
));
71-
res.unwrap_or_else(Self::new)
71+
res.unwrap_or_default()
7272
}
7373
}
7474

@@ -82,7 +82,7 @@ impl Transform {
8282
factor_y,
8383
factor_z,
8484
));
85-
res.unwrap_or_else(Self::new)
85+
res.unwrap_or_default()
8686
}
8787
}
8888

@@ -97,7 +97,7 @@ impl Transform {
9797
skew_x,
9898
skew_y,
9999
));
100-
res.unwrap_or_else(Self::new)
100+
res.unwrap_or_default()
101101
}
102102
}
103103

@@ -109,7 +109,7 @@ impl Transform {
109109
self.into_glib_ptr(),
110110
other.to_glib_none().0,
111111
));
112-
res.unwrap_or_else(Self::new)
112+
res.unwrap_or_default()
113113
}
114114
}
115115

@@ -121,7 +121,7 @@ impl Transform {
121121
self.into_glib_ptr(),
122122
point.to_glib_none().0,
123123
));
124-
res.unwrap_or_else(Self::new)
124+
res.unwrap_or_default()
125125
}
126126
}
127127

@@ -133,7 +133,7 @@ impl Transform {
133133
self.into_glib_ptr(),
134134
point.to_glib_none().0,
135135
));
136-
res.unwrap_or_else(Self::new)
136+
res.unwrap_or_default()
137137
}
138138
}
139139
}

gtk4/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Builder {
2424
if ptr.is_null() {
2525
None
2626
} else {
27-
glib::gobject_ffi::g_object_ref(ptr as *mut glib::gobject_ffi::GObject);
27+
glib::gobject_ffi::g_object_ref(ptr);
2828
Some(from_glib_full(ptr))
2929
}
3030
}

gtk4/src/builder_rust_scope.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ mod tests {
190190
use super::BuilderRustScope;
191191
use crate::{self as gtk4, prelude::*, subclass::prelude::*, Builder};
192192

193-
const SIGNAL_XML: &str = r##"
193+
const SIGNAL_XML: &str = r#"
194194
<?xml version="1.0" encoding="UTF-8"?>
195195
<interface>
196196
<object class="GtkButton" id="button">
197197
<property name="label">Hello World</property>
198198
<signal name="clicked" handler="button_clicked"/>
199199
</object>
200200
</interface>
201-
"##;
201+
"#;
202202

203203
#[crate::test]
204204
fn test_rust_builder_scope_signal_handler() {
@@ -225,7 +225,7 @@ mod tests {
225225
assert_eq!(button.label().unwrap().as_str(), "Clicked");
226226
}
227227

228-
const CLOSURE_XML: &str = r##"
228+
const CLOSURE_XML: &str = r#"
229229
<?xml version="1.0" encoding="UTF-8"?>
230230
<interface>
231231
<object class="GtkEntry" id="entry_a"/>
@@ -237,7 +237,7 @@ mod tests {
237237
</binding>
238238
</object>
239239
</interface>
240-
"##;
240+
"#;
241241

242242
#[crate::test]
243243
fn test_rust_builder_scope_closure() {
@@ -290,14 +290,14 @@ mod tests {
290290
entry_a.set_text("Hello World");
291291
}
292292

293-
const DISPOSE_XML: &str = r##"
293+
const DISPOSE_XML: &str = r#"
294294
<?xml version="1.0" encoding="UTF-8"?>
295295
<interface>
296296
<object class="MyObject" id="obj">
297297
<signal name="destroyed" handler="my_object_destroyed" object="obj" swapped="true" />
298298
</object>
299299
</interface>
300-
"##;
300+
"#;
301301

302302
#[crate::test]
303303
fn test_rust_builder_scope_object_during_dispose() {

gtk4/src/enums.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl glib::HasParamSpec for Align {
157157
type BuilderFn = fn(&str, Self) -> glib::ParamSpecEnumBuilder<Self>;
158158

159159
fn param_spec_builder() -> Self::BuilderFn {
160-
|name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
160+
Self::ParamSpec::builder_with_default
161161
}
162162
}
163163

gtk4/src/param_spec_expression.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,7 @@ impl ParamSpecExpression {
133133
}
134134

135135
pub fn upcast(self) -> ParamSpec {
136-
unsafe {
137-
from_glib_full(
138-
IntoGlibPtr::<*mut _>::into_glib_ptr(self) as *mut gobject_ffi::GParamSpec
139-
)
140-
}
136+
unsafe { from_glib_full(IntoGlibPtr::<*mut _>::into_glib_ptr(self)) }
141137
}
142138

143139
pub fn upcast_ref(&self) -> &ParamSpec {
@@ -217,7 +213,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for ParamSpecExpression {
217213
unsafe fn from_value(value: &'a Value) -> Self {
218214
let ptr = gobject_ffi::g_value_dup_param(value.to_glib_none().0);
219215
debug_assert!(!ptr.is_null());
220-
from_glib_full(ptr as *mut gobject_ffi::GParamSpec)
216+
from_glib_full(ptr)
221217
}
222218
}
223219

0 commit comments

Comments
 (0)