Skip to content

Commit 787e914

Browse files
lifr0mlifr0m
committed
refactor
1 parent 41c9af7 commit 787e914

File tree

7 files changed

+256
-269
lines changed

7 files changed

+256
-269
lines changed

‎README.md‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,34 +37,34 @@ pub enum Error {
3737
}
3838

3939
impl crate::Serialize for Error {
40-
fn serialize(&self, buf: &mut Vec<u8>) {
40+
fn serialize(&self, dst: &mut Vec<u8>) {
4141
match self {
4242
Self::InvalidUserId { user_id: user_id_, } => {
43-
2283843567_u32.serialize(buf);
44-
user_id_.serialize(buf);
43+
2283843567_u32.serialize(dst);
44+
user_id_.serialize(dst);
4545
}
4646
Self::TooLongText { text: text_, max_length: max_length_, } => {
47-
1447747856_u32.serialize(buf);
48-
text_.serialize(buf);
49-
max_length_.serialize(buf);
47+
1447747856_u32.serialize(dst);
48+
text_.serialize(dst);
49+
max_length_.serialize(dst);
5050
}
5151
};
5252
}
5353
}
5454

5555
impl crate::Deserialize for Error {
56-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
57-
let id = u32::deserialize(reader)?;
56+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
57+
let id = u32::deserialize(src)?;
5858

5959
Ok(match id {
6060
2283843567_u32 => {
61-
let user_id_ = i64::deserialize(reader)?;
61+
let user_id_ = i64::deserialize(src)?;
6262

6363
Self::InvalidUserId { user_id: user_id_, }
6464
}
6565
1447747856_u32 => {
66-
let text_ = String::deserialize(reader)?;
67-
let max_length_ = i32::deserialize(reader)?;
66+
let text_ = String::deserialize(src)?;
67+
let max_length_ = i32::deserialize(src)?;
6868

6969
Self::TooLongText { text: text_, max_length: max_length_, }
7070
}
@@ -80,12 +80,12 @@ pub enum Function {
8080
}
8181

8282
impl crate::Deserialize for Function {
83-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
84-
let id = u32::deserialize(reader)?;
83+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
84+
let id = u32::deserialize(src)?;
8585

8686
Ok(match id {
87-
1904452899_u32 => Self::GetUsers(self::functions::GetUsers::deserialize(reader)?),
88-
339054040_u32 => Self::SendMessage(self::functions::SendMessage::deserialize(reader)?),
87+
1904452899_u32 => Self::GetUsers(self::functions::GetUsers::deserialize(src)?),
88+
339054040_u32 => Self::SendMessage(self::functions::SendMessage::deserialize(src)?),
8989
_ => return Err(crate::deserialize::Error::UnexpectedDefinitionId(id)),
9090
})
9191
}
@@ -103,29 +103,29 @@ pub mod types {
103103
}
104104

105105
impl crate::Serialize for Message {
106-
fn serialize(&self, buf: &mut Vec<u8>) {
106+
fn serialize(&self, dst: &mut Vec<u8>) {
107107
match self {
108108
Self::Message { id: id_, text: text_, photos: photos_, sent_at: sent_at_, } => {
109-
2225622240_u32.serialize(buf);
110-
id_.serialize(buf);
111-
text_.serialize(buf);
112-
photos_.serialize(buf);
113-
sent_at_.serialize(buf);
109+
2225622240_u32.serialize(dst);
110+
id_.serialize(dst);
111+
text_.serialize(dst);
112+
photos_.serialize(dst);
113+
sent_at_.serialize(dst);
114114
}
115115
};
116116
}
117117
}
118118

119119
impl crate::Deserialize for Message {
120-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
121-
let id = u32::deserialize(reader)?;
120+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
121+
let id = u32::deserialize(src)?;
122122

123123
Ok(match id {
124124
2225622240_u32 => {
125-
let id_ = i32::deserialize(reader)?;
126-
let text_ = Option::<String>::deserialize(reader)?;
127-
let photos_ = Vec::<Vec::<u8>>::deserialize(reader)?;
128-
let sent_at_ = std::time::SystemTime::deserialize(reader)?;
125+
let id_ = i32::deserialize(src)?;
126+
let text_ = Option::<String>::deserialize(src)?;
127+
let photos_ = Vec::<Vec::<u8>>::deserialize(src)?;
128+
let sent_at_ = std::time::SystemTime::deserialize(src)?;
129129

130130
Self::Message { id: id_, text: text_, photos: photos_, sent_at: sent_at_, }
131131
}
@@ -147,36 +147,36 @@ pub mod types {
147147
}
148148

149149
impl crate::Serialize for User {
150-
fn serialize(&self, buf: &mut Vec<u8>) {
150+
fn serialize(&self, dst: &mut Vec<u8>) {
151151
match self {
152152
Self::User { id: id_, verified: verified_, rating: rating_, } => {
153-
4055296785_u32.serialize(buf);
154-
id_.serialize(buf);
155-
verified_.serialize(buf);
156-
rating_.serialize(buf);
153+
4055296785_u32.serialize(dst);
154+
id_.serialize(dst);
155+
verified_.serialize(dst);
156+
rating_.serialize(dst);
157157
}
158158
Self::UserEmpty { id: id_, } => {
159-
990500211_u32.serialize(buf);
160-
id_.serialize(buf);
159+
990500211_u32.serialize(dst);
160+
id_.serialize(dst);
161161
}
162162
};
163163
}
164164
}
165165

166166
impl crate::Deserialize for User {
167-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
168-
let id = u32::deserialize(reader)?;
167+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
168+
let id = u32::deserialize(src)?;
169169

170170
Ok(match id {
171171
4055296785_u32 => {
172-
let id_ = i64::deserialize(reader)?;
173-
let verified_ = bool::deserialize(reader)?;
174-
let rating_ = f64::deserialize(reader)?;
172+
let id_ = i64::deserialize(src)?;
173+
let verified_ = bool::deserialize(src)?;
174+
let rating_ = f64::deserialize(src)?;
175175

176176
Self::User { id: id_, verified: verified_, rating: rating_, }
177177
}
178178
990500211_u32 => {
179-
let id_ = i64::deserialize(reader)?;
179+
let id_ = i64::deserialize(src)?;
180180

181181
Self::UserEmpty { id: id_, }
182182
}
@@ -194,15 +194,15 @@ pub mod functions {
194194
}
195195

196196
impl crate::Serialize for GetUsers {
197-
fn serialize(&self, buf: &mut Vec<u8>) {
198-
1904452899_u32.serialize(buf);
199-
self.user_ids.serialize(buf);
197+
fn serialize(&self, dst: &mut Vec<u8>) {
198+
1904452899_u32.serialize(dst);
199+
self.user_ids.serialize(dst);
200200
}
201201
}
202202

203203
impl crate::Deserialize for GetUsers {
204-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
205-
let user_ids_ = Vec::<i64>::deserialize(reader)?;
204+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
205+
let user_ids_ = Vec::<i64>::deserialize(src)?;
206206

207207
Ok(Self { user_ids: user_ids_, })
208208
}
@@ -220,19 +220,19 @@ pub mod functions {
220220
}
221221

222222
impl crate::Serialize for SendMessage {
223-
fn serialize(&self, buf: &mut Vec<u8>) {
224-
339054040_u32.serialize(buf);
225-
self.user_id.serialize(buf);
226-
self.text.serialize(buf);
227-
self.photos.serialize(buf);
223+
fn serialize(&self, dst: &mut Vec<u8>) {
224+
339054040_u32.serialize(dst);
225+
self.user_id.serialize(dst);
226+
self.text.serialize(dst);
227+
self.photos.serialize(dst);
228228
}
229229
}
230230

231231
impl crate::Deserialize for SendMessage {
232-
fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {
233-
let user_id_ = i64::deserialize(reader)?;
234-
let text_ = Option::<String>::deserialize(reader)?;
235-
let photos_ = Vec::<Vec::<u8>>::deserialize(reader)?;
232+
fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {
233+
let user_id_ = i64::deserialize(src)?;
234+
let text_ = Option::<String>::deserialize(src)?;
235+
let photos_ = Vec::<Vec::<u8>>::deserialize(src)?;
236236

237237
Ok(Self { user_id: user_id_, text: text_, photos: photos_, })
238238
}

‎tl-generator/src/generate.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn generate_enum(
153153
o.write(" {");
154154
});
155155
o.with_indent(|o| {
156-
o.write_line(|o| o.write("fn serialize(&self, buf: &mut Vec<u8>) {"));
156+
o.write_line(|o| o.write("fn serialize(&self, dst: &mut Vec<u8>) {"));
157157
o.with_indent(|o| {
158158
o.write_line(|o| o.write("match self {"));
159159
o.with_indent(|o| {
@@ -173,12 +173,12 @@ fn generate_enum(
173173
o.with_indent(|o| {
174174
o.write_line(|o| {
175175
generate_definition_id(o, def);
176-
o.write(".serialize(buf);");
176+
o.write(".serialize(dst);");
177177
});
178178
for field in &def.fields {
179179
o.write_line(|o| {
180180
o.write(&field.name);
181-
o.write("_.serialize(buf);");
181+
o.write("_.serialize(dst);");
182182
});
183183
}
184184
});
@@ -200,9 +200,9 @@ fn generate_enum(
200200
o.write(" {");
201201
});
202202
o.with_indent(|o| {
203-
o.write_line(|o| o.write("fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {"));
203+
o.write_line(|o| o.write("fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {"));
204204
o.with_indent(|o| {
205-
o.write_line(|o| o.write("let id = u32::deserialize(reader)?;"));
205+
o.write_line(|o| o.write("let id = u32::deserialize(src)?;"));
206206
o.write("\n");
207207
o.write_line(|o| o.write("Ok(match id {"));
208208
o.with_indent(|o| {
@@ -214,7 +214,7 @@ fn generate_enum(
214214
o.write(&get_definition_name(def, is_function));
215215
o.write("(self::functions::");
216216
o.write(&get_definition_name(def, is_function));
217-
o.write("::deserialize(reader)?),");
217+
o.write("::deserialize(src)?),");
218218
});
219219
} else {
220220
o.write_line(|o| {
@@ -228,7 +228,7 @@ fn generate_enum(
228228
o.write(&field.name);
229229
o.write("_ = ");
230230
generate_type(o, &field.typ, false);
231-
o.write("::deserialize(reader)?;");
231+
o.write("::deserialize(src)?;");
232232
});
233233
}
234234
o.write("\n");
@@ -289,19 +289,19 @@ fn generate_definition(
289289
o.write(" {");
290290
});
291291
o.with_indent(|o| {
292-
o.write_line(|o| o.write("fn serialize(&self, buf: &mut Vec<u8>) {"));
292+
o.write_line(|o| o.write("fn serialize(&self, dst: &mut Vec<u8>) {"));
293293
o.with_indent(|o| {
294294
if ret.is_some() {
295295
o.write_line(|o| {
296296
generate_definition_id(o, def);
297-
o.write(".serialize(buf);");
297+
o.write(".serialize(dst);");
298298
});
299299
}
300300
for field in &def.fields {
301301
o.write_line(|o| {
302302
o.write("self.");
303303
o.write(&field.name);
304-
o.write(".serialize(buf);");
304+
o.write(".serialize(dst);");
305305
});
306306
}
307307
});
@@ -317,15 +317,15 @@ fn generate_definition(
317317
o.write(" {");
318318
});
319319
o.with_indent(|o| {
320-
o.write_line(|o| o.write("fn deserialize(reader: &mut crate::Reader) -> Result<Self, crate::deserialize::Error> {"));
320+
o.write_line(|o| o.write("fn deserialize(src: &mut &[u8]) -> Result<Self, crate::deserialize::Error> {"));
321321
o.with_indent(|o| {
322322
for field in &def.fields {
323323
o.write_line(|o| {
324324
o.write("let ");
325325
o.write(&field.name);
326326
o.write("_ = ");
327327
generate_type(o, &field.typ, true);
328-
o.write("::deserialize(reader)?;");
328+
o.write("::deserialize(src)?;");
329329
});
330330
}
331331
o.write("\n");

0 commit comments

Comments
 (0)