Skip to content

Commit c1ae4ed

Browse files
committed
merge macro lines
1 parent bd86ff5 commit c1ae4ed

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

src/header.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ pub struct Style {
3636

3737
/// Information about the document, including references to fonts & styles
3838
#[derive(Default, Debug, Clone, PartialEq, Deserialize, Serialize)]
39-
#[cfg_attr(feature = "jsbindings", derive(Tsify))]
40-
#[cfg_attr(feature = "jsbindings", tsify(into_wasm_abi, from_wasm_abi))]
39+
#[cfg_attr(feature = "jsbindings", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
4140
pub struct RtfHeader {
4241
pub character_set: CharacterSet,
4342
pub font_table: FontTable,
@@ -63,8 +62,7 @@ pub struct Color {
6362

6463
#[allow(dead_code)]
6564
#[derive(Debug, PartialEq, Default, Clone, Hash, Deserialize, Serialize)]
66-
#[cfg_attr(feature = "jsbindings", derive(Tsify))]
67-
#[cfg_attr(feature = "jsbindings", tsify(into_wasm_abi, from_wasm_abi))]
65+
#[cfg_attr(feature = "jsbindings", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
6866
pub enum CharacterSet {
6967
#[default]
7068
Ansi,
@@ -86,8 +84,7 @@ impl CharacterSet {
8684

8785
#[allow(dead_code)]
8886
#[derive(Debug, PartialEq, Hash, Clone, Default, Deserialize, Serialize)]
89-
#[cfg_attr(feature = "jsbindings", derive(Tsify))]
90-
#[cfg_attr(feature = "jsbindings", tsify(into_wasm_abi, from_wasm_abi))]
87+
#[cfg_attr(feature = "jsbindings", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
9188
pub enum FontFamily {
9289
#[default]
9390
Nil,

src/paragraph.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ pub struct Paragraph {
1919

2020
/// Alignement of a paragraph (left, right, center, justify)
2121
#[derive(Debug, Default, Clone, Copy, PartialEq, Hash, Deserialize, Serialize)]
22-
#[cfg_attr(feature = "jsbindings", derive(Tsify))]
23-
#[cfg_attr(feature = "jsbindings", tsify(into_wasm_abi, from_wasm_abi))]
22+
#[cfg_attr(feature = "jsbindings", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
2423
pub enum Alignment {
2524
#[default]
2625
LeftAligned, // \ql
@@ -52,8 +51,7 @@ pub struct Spacing {
5251
}
5352

5453
#[derive(Default, Debug, Clone, Copy, PartialEq, Hash, Deserialize, Serialize)]
55-
#[cfg_attr(feature = "jsbindings", derive(Tsify))]
56-
#[cfg_attr(feature = "jsbindings", tsify(into_wasm_abi, from_wasm_abi))]
54+
#[cfg_attr(feature = "jsbindings", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
5755
pub enum SpaceBetweenLine {
5856
Value(i32),
5957
#[default]

0 commit comments

Comments
 (0)