Skip to content

Commit dd3873d

Browse files
behdadbehdad
committed
Remove shape from TableRef
1 parent eec842b commit dd3873d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+290
-297
lines changed

‎font-codegen/src/table.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ pub(crate) fn generate(item: &Table) -> syn::Result<TokenStream> {
5151
pub(crate) fn into_concrete<T>(self) -> #raw_name<'a, #t> {
5252
let TableRef { data, #shape_name} = self;
5353
TableRef {
54-
shape: #marker_name,
5554
args: std::marker::PhantomData,
5655
data,
56+
_marker: std::marker::PhantomData,
5757
}
5858
}
5959
}
@@ -66,9 +66,9 @@ pub(crate) fn generate(item: &Table) -> syn::Result<TokenStream> {
6666
pub(crate) fn of_unit_type(&self) -> #raw_name<'a, ()> {
6767
let TableRef { data, #shape_name} = self;
6868
TableRef {
69-
shape: #marker_name,
7069
args: std::marker::PhantomData,
7170
data: *data,
71+
_marker: std::marker::PhantomData,
7272
}
7373
}
7474
}
@@ -127,7 +127,6 @@ pub(crate) fn generate(item: &Table) -> syn::Result<TokenStream> {
127127
}
128128

129129
fn generate_font_read(item: &Table) -> syn::Result<TokenStream> {
130-
let marker_name = item.marker_name();
131130
let name = item.raw_name();
132131
let generic = item.attrs.generic_offset.as_ref();
133132
let error_if_phantom_and_read_args = generic.map(|_| {
@@ -150,9 +149,9 @@ fn generate_font_read(item: &Table) -> syn::Result<TokenStream> {
150149
fn read_with_args(data: FontData<'a>, args: &#args_type) -> Result<Self, ReadError> {
151150
let args = *args;
152151
Ok(TableRef {
153-
shape: #marker_name,
154152
args,
155153
data,
154+
_marker: std::marker::PhantomData,
156155
})
157156
}
158157
}
@@ -177,9 +176,9 @@ fn generate_font_read(item: &Table) -> syn::Result<TokenStream> {
177176
impl<'a, #generic> FontRead<'a> for #name<'a, #generic> {
178177
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
179178
Ok(TableRef {
180-
shape: #marker_name,
181179
args: #args_value,
182180
data,
181+
_marker: std::marker::PhantomData,
183182
})
184183
}
185184
}

‎read-fonts/generated/font.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ impl<'a> MinByteRange for TableDirectory<'a> {
1919
impl<'a> FontRead<'a> for TableDirectory<'a> {
2020
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
2121
Ok(TableRef {
22-
shape: TableDirectoryMarker,
2322
args: (),
2423
data,
24+
_marker: std::marker::PhantomData,
2525
})
2626
}
2727
}
@@ -208,9 +208,9 @@ impl<'a> MinByteRange for TTCHeader<'a> {
208208
impl<'a> FontRead<'a> for TTCHeader<'a> {
209209
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
210210
Ok(TableRef {
211-
shape: TTCHeaderMarker,
212211
args: (),
213212
data,
213+
_marker: std::marker::PhantomData,
214214
})
215215
}
216216
}

‎read-fonts/generated/generated_aat.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ impl<'a> MinByteRange for Lookup0<'a> {
121121
impl<'a> FontRead<'a> for Lookup0<'a> {
122122
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
123123
Ok(TableRef {
124-
shape: Lookup0Marker,
125124
args: (),
126125
data,
126+
_marker: std::marker::PhantomData,
127127
})
128128
}
129129
}
@@ -207,9 +207,9 @@ impl<'a> MinByteRange for Lookup2<'a> {
207207
impl<'a> FontRead<'a> for Lookup2<'a> {
208208
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
209209
Ok(TableRef {
210-
shape: Lookup2Marker,
211210
args: (),
212211
data,
212+
_marker: std::marker::PhantomData,
213213
})
214214
}
215215
}
@@ -353,9 +353,9 @@ impl<'a> MinByteRange for Lookup4<'a> {
353353
impl<'a> FontRead<'a> for Lookup4<'a> {
354354
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
355355
Ok(TableRef {
356-
shape: Lookup4Marker,
357356
args: (),
358357
data,
358+
_marker: std::marker::PhantomData,
359359
})
360360
}
361361
}
@@ -555,9 +555,9 @@ impl<'a> MinByteRange for Lookup6<'a> {
555555
impl<'a> FontRead<'a> for Lookup6<'a> {
556556
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
557557
Ok(TableRef {
558-
shape: Lookup6Marker,
559558
args: (),
560559
data,
560+
_marker: std::marker::PhantomData,
561561
})
562562
}
563563
}
@@ -699,9 +699,9 @@ impl<'a> MinByteRange for Lookup8<'a> {
699699
impl<'a> FontRead<'a> for Lookup8<'a> {
700700
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
701701
Ok(TableRef {
702-
shape: Lookup8Marker,
703702
args: (),
704703
data,
704+
_marker: std::marker::PhantomData,
705705
})
706706
}
707707
}
@@ -809,9 +809,9 @@ impl<'a> MinByteRange for Lookup10<'a> {
809809
impl<'a> FontRead<'a> for Lookup10<'a> {
810810
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
811811
Ok(TableRef {
812-
shape: Lookup10Marker,
813812
args: (),
814813
data,
814+
_marker: std::marker::PhantomData,
815815
})
816816
}
817817
}
@@ -927,9 +927,9 @@ impl<'a> MinByteRange for StateHeader<'a> {
927927
impl<'a> FontRead<'a> for StateHeader<'a> {
928928
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
929929
Ok(TableRef {
930-
shape: StateHeaderMarker,
931930
args: (),
932931
data,
932+
_marker: std::marker::PhantomData,
933933
})
934934
}
935935
}
@@ -1050,9 +1050,9 @@ impl<'a> MinByteRange for ClassSubtable<'a> {
10501050
impl<'a> FontRead<'a> for ClassSubtable<'a> {
10511051
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
10521052
Ok(TableRef {
1053-
shape: ClassSubtableMarker,
10541053
args: (),
10551054
data,
1055+
_marker: std::marker::PhantomData,
10561056
})
10571057
}
10581058
}
@@ -1141,9 +1141,9 @@ impl<'a> MinByteRange for RawBytes<'a> {
11411141
impl<'a> FontRead<'a> for RawBytes<'a> {
11421142
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
11431143
Ok(TableRef {
1144-
shape: RawBytesMarker,
11451144
args: (),
11461145
data,
1146+
_marker: std::marker::PhantomData,
11471147
})
11481148
}
11491149
}
@@ -1207,9 +1207,9 @@ impl<'a> MinByteRange for StxHeader<'a> {
12071207
impl<'a> FontRead<'a> for StxHeader<'a> {
12081208
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
12091209
Ok(TableRef {
1210-
shape: StxHeaderMarker,
12111210
args: (),
12121211
data,
1212+
_marker: std::marker::PhantomData,
12131213
})
12141214
}
12151215
}
@@ -1329,9 +1329,9 @@ impl<'a> MinByteRange for RawWords<'a> {
13291329
impl<'a> FontRead<'a> for RawWords<'a> {
13301330
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
13311331
Ok(TableRef {
1332-
shape: RawWordsMarker,
13331332
args: (),
13341333
data,
1334+
_marker: std::marker::PhantomData,
13351335
})
13361336
}
13371337
}

‎read-fonts/generated/generated_ankr.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ impl TopLevelTable for Ankr<'_> {
2424
impl<'a> FontRead<'a> for Ankr<'a> {
2525
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
2626
Ok(TableRef {
27-
shape: AnkrMarker,
2827
args: (),
2928
data,
29+
_marker: std::marker::PhantomData,
3030
})
3131
}
3232
}
@@ -132,9 +132,9 @@ impl<'a> MinByteRange for GlyphDataEntry<'a> {
132132
impl<'a> FontRead<'a> for GlyphDataEntry<'a> {
133133
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
134134
Ok(TableRef {
135-
shape: GlyphDataEntryMarker,
136135
args: (),
137136
data,
137+
_marker: std::marker::PhantomData,
138138
})
139139
}
140140
}

‎read-fonts/generated/generated_avar.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ impl TopLevelTable for Avar<'_> {
2424
impl<'a> FontRead<'a> for Avar<'a> {
2525
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
2626
Ok(TableRef {
27-
shape: AvarMarker,
2827
args: (),
2928
data,
29+
_marker: std::marker::PhantomData,
3030
})
3131
}
3232
}

‎read-fonts/generated/generated_base.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ impl TopLevelTable for Base<'_> {
2424
impl<'a> FontRead<'a> for Base<'a> {
2525
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
2626
Ok(TableRef {
27-
shape: BaseMarker,
2827
args: (),
2928
data,
29+
_marker: std::marker::PhantomData,
3030
})
3131
}
3232
}
@@ -151,9 +151,9 @@ impl<'a> MinByteRange for Axis<'a> {
151151
impl<'a> FontRead<'a> for Axis<'a> {
152152
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
153153
Ok(TableRef {
154-
shape: AxisMarker,
155154
args: (),
156155
data,
156+
_marker: std::marker::PhantomData,
157157
})
158158
}
159159
}
@@ -241,9 +241,9 @@ impl<'a> MinByteRange for BaseTagList<'a> {
241241
impl<'a> FontRead<'a> for BaseTagList<'a> {
242242
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
243243
Ok(TableRef {
244-
shape: BaseTagListMarker,
245244
args: (),
246245
data,
246+
_marker: std::marker::PhantomData,
247247
})
248248
}
249249
}
@@ -321,9 +321,9 @@ impl<'a> MinByteRange for BaseScriptList<'a> {
321321
impl<'a> FontRead<'a> for BaseScriptList<'a> {
322322
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
323323
Ok(TableRef {
324-
shape: BaseScriptListMarker,
325324
args: (),
326325
data,
326+
_marker: std::marker::PhantomData,
327327
})
328328
}
329329
}
@@ -460,9 +460,9 @@ impl<'a> MinByteRange for BaseScript<'a> {
460460
impl<'a> FontRead<'a> for BaseScript<'a> {
461461
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
462462
Ok(TableRef {
463-
shape: BaseScriptMarker,
464463
args: (),
465464
data,
465+
_marker: std::marker::PhantomData,
466466
})
467467
}
468468
}
@@ -644,9 +644,9 @@ impl<'a> MinByteRange for BaseValues<'a> {
644644
impl<'a> FontRead<'a> for BaseValues<'a> {
645645
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
646646
Ok(TableRef {
647-
shape: BaseValuesMarker,
648647
args: (),
649648
data,
649+
_marker: std::marker::PhantomData,
650650
})
651651
}
652652
}
@@ -762,9 +762,9 @@ impl<'a> MinByteRange for MinMax<'a> {
762762
impl<'a> FontRead<'a> for MinMax<'a> {
763763
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
764764
Ok(TableRef {
765-
shape: MinMaxMarker,
766765
args: (),
767766
data,
767+
_marker: std::marker::PhantomData,
768768
})
769769
}
770770
}
@@ -1062,9 +1062,9 @@ impl<'a> MinByteRange for BaseCoordFormat1<'a> {
10621062
impl<'a> FontRead<'a> for BaseCoordFormat1<'a> {
10631063
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
10641064
Ok(TableRef {
1065-
shape: BaseCoordFormat1Marker,
10661065
args: (),
10671066
data,
1067+
_marker: std::marker::PhantomData,
10681068
})
10691069
}
10701070
}
@@ -1137,9 +1137,9 @@ impl<'a> MinByteRange for BaseCoordFormat2<'a> {
11371137
impl<'a> FontRead<'a> for BaseCoordFormat2<'a> {
11381138
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
11391139
Ok(TableRef {
1140-
shape: BaseCoordFormat2Marker,
11411140
args: (),
11421141
data,
1142+
_marker: std::marker::PhantomData,
11431143
})
11441144
}
11451145
}
@@ -1236,9 +1236,9 @@ impl<'a> MinByteRange for BaseCoordFormat3<'a> {
12361236
impl<'a> FontRead<'a> for BaseCoordFormat3<'a> {
12371237
fn read(data: FontData<'a>) -> Result<Self, ReadError> {
12381238
Ok(TableRef {
1239-
shape: BaseCoordFormat3Marker,
12401239
args: (),
12411240
data,
1241+
_marker: std::marker::PhantomData,
12421242
})
12431243
}
12441244
}

0 commit comments

Comments
 (0)