Skip to content

Commit 46d6b26

Browse files
committed
library: impl Default for Parameter
This simplifies constructions a bit.
1 parent 8387466 commit 46d6b26

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

src/analysis/properties.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -347,17 +347,8 @@ fn analyze_property(
347347
.find_type(library::INTERNAL_NAMESPACE, "none")
348348
.unwrap(),
349349
c_type: "none".into(),
350-
instance_parameter: false,
351350
direction: library::ParameterDirection::Return,
352-
transfer: library::Transfer::None,
353-
caller_allocates: false,
354-
nullable: library::Nullable(false),
355-
array_length: None,
356-
is_error: false,
357-
doc: None,
358-
scope: library::ParameterScope::None,
359-
closure: None,
360-
destroy: None,
351+
..Default::default()
361352
},
362353
is_action: false,
363354
is_detailed: false, /* well, technically this *is* an instance of a detailed

src/library.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ use crate::{
1212
nameutil::split_namespace_name, traits::*, version::Version,
1313
};
1414

15-
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
15+
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
1616
pub enum Transfer {
17+
#[default]
1718
None,
1819
Container,
1920
Full,
@@ -118,7 +119,7 @@ impl FromStr for ParameterScope {
118119
}
119120
}
120121

121-
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
122+
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
122123
pub struct Nullable(pub bool);
123124

124125
impl Deref for Nullable {
@@ -520,7 +521,7 @@ pub struct Property {
520521
pub setter: Option<String>,
521522
}
522523

523-
#[derive(Clone, Debug)]
524+
#[derive(Clone, Debug, Default)]
524525
pub struct Parameter {
525526
pub name: String,
526527
pub typ: TypeId,

src/parser.rs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -575,17 +575,11 @@ impl Library {
575575
name: "error".into(),
576576
typ: self.find_or_stub_type(ns_id, "GLib.Error"),
577577
c_type: "GError**".into(),
578-
instance_parameter: false,
579578
direction: ParameterDirection::Out,
580579
transfer: Transfer::Full,
581-
caller_allocates: false,
582580
nullable: Nullable(true),
583-
array_length: None,
584581
is_error: true,
585-
doc: None,
586-
scope: ParameterScope::None,
587-
closure: None,
588-
destroy: None,
582+
..Default::default()
589583
});
590584
}
591585

@@ -1104,14 +1098,9 @@ impl Library {
11041098
instance_parameter: false,
11051099
direction: ParameterDirection::Out,
11061100
transfer: Transfer::Full,
1107-
caller_allocates: false,
11081101
nullable: Nullable(true),
1109-
array_length: None,
11101102
is_error: true,
1111-
doc: None,
1112-
scope: ParameterScope::None,
1113-
closure: None,
1114-
destroy: None,
1103+
..Default::default()
11151104
});
11161105
}
11171106
if let Some(ret) = ret {
@@ -1335,16 +1324,11 @@ impl Library {
13351324
typ: self.find_type(INTERNAL_NAMESPACE, "varargs").unwrap(),
13361325
c_type: String::new(),
13371326
instance_parameter,
1338-
direction: Default::default(),
1339-
transfer: Transfer::None,
1340-
caller_allocates: false,
1341-
nullable: Nullable(false),
1342-
array_length: None,
1343-
is_error: false,
13441327
doc,
13451328
scope,
13461329
closure,
13471330
destroy,
1331+
..Default::default()
13481332
})
13491333
} else {
13501334
Err(parser.fail_with_position(

0 commit comments

Comments
 (0)