Skip to content

Commit 9ca9322

Browse files
gadungagadunga
committed
Bump editions, dependencies and build toolchain
1 parent c6ed504 commit 9ca9322

File tree

7 files changed

+63
-61
lines changed

7 files changed

+63
-61
lines changed

‎Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "nobject-rs"
3-
version = "1.3.2"
3+
version = "2.0.0"
44
authors = ["shmapdy <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT"
77
keywords = ["gamedev", "graphics", "wavefront", "obj", "mtl"]
88
categories = ["rendering::data-formats"]
@@ -14,5 +14,5 @@ description = "A parser for wavefront Obj/Mtl files. Written with Nom."
1414
[dependencies]
1515
derive_more = "0.99"
1616
log = "0.4"
17-
nom = "6.2"
18-
thiserror = "1.0"
17+
nom = "7.1.3"
18+
thiserror = "1.0"

‎rust-toolchain

-1
This file was deleted.

‎rust-toolchain.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "stable"
3+
components = ["rustfmt", "clippy"]

‎src/model.rs

+49-49
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ pub(crate) fn parse(input: &[Token]) -> Result<Model, ModelError> {
235235
parse_texture_map,
236236
parse_group,
237237
)),
238-
Model::default(),
238+
Model::default,
239239
|mut model: Model, item: ModelElement| {
240240
match item {
241241
ModelElement::Vertex(x) => model.vertices.push(x),
@@ -247,52 +247,52 @@ pub(crate) fn parse(input: &[Token]) -> Result<Model, ModelError> {
247247
let set = model.faces.entry(g.clone()).or_insert_with(Vec::new);
248248
set.push(f.clone());
249249
}
250-
}
250+
},
251251
ModelElement::Line(l) => {
252252
for g in &model.current_group {
253253
let set = model.lines.entry(g.clone()).or_insert_with(Vec::new);
254254
set.push(l.clone());
255255
}
256-
}
256+
},
257257
ModelElement::Point(p) => {
258258
for g in &model.current_group {
259259
let set = model.points.entry(g.clone()).or_insert_with(Vec::new);
260260
set.push(p.clone());
261261
}
262-
}
262+
},
263263
ModelElement::Group(groups) => {
264264
model.current_group.clear();
265265
for g in groups {
266266
model.groups.insert(g.clone(), Default::default());
267267
model.current_group.push(g);
268268
}
269-
}
269+
},
270270
ModelElement::MaterialLib(libs) => model.material_libs.extend(libs),
271271
ModelElement::Material(name) => {
272272
for g in &model.current_group {
273273
let group = model.groups.entry(g.clone()).or_default();
274274
group.material_name = name.clone();
275275
}
276-
}
277-
ModelElement::ObjName(_name) => {}
276+
},
277+
ModelElement::ObjName(_name) => {},
278278
ModelElement::Smoothing(group_id) => {
279279
model.current_smoothing_group = group_id;
280-
}
281-
ModelElement::Bevel(_flag) => {}
282-
ModelElement::CInterp(_flag) => {}
283-
ModelElement::DInterp(_flag) => {}
284-
ModelElement::Lod(_level) => {}
285-
ModelElement::ShadowObj(_name) => {}
286-
ModelElement::TraceObj(_name) => {}
280+
},
281+
ModelElement::Bevel(_flag) => {},
282+
ModelElement::CInterp(_flag) => {},
283+
ModelElement::DInterp(_flag) => {},
284+
ModelElement::Lod(_level) => {},
285+
ModelElement::ShadowObj(_name) => {},
286+
ModelElement::TraceObj(_name) => {},
287287
ModelElement::TextureLib(libs) => {
288288
model.texture_libs.extend(libs);
289-
}
289+
},
290290
ModelElement::TextureMap(name) => {
291291
for g in &model.current_group {
292292
let group = model.groups.entry(g.clone()).or_default();
293293
group.texture_map = Some(name.clone());
294294
}
295-
}
295+
},
296296
}
297297
model
298298
},
@@ -321,29 +321,29 @@ pub(crate) fn parse_vertex(input: &[Token]) -> IResult<&[Token], Vertex> {
321321
Err(e) => {
322322
log::error!("{}", e);
323323
Default::default()
324-
}
324+
},
325325
},
326326
match get_token_float(&y) {
327327
Ok(s) => s,
328328
Err(e) => {
329329
log::error!("{}", e);
330330
Default::default()
331-
}
331+
},
332332
},
333333
match get_token_float(&z) {
334334
Ok(s) => s,
335335
Err(e) => {
336336
log::error!("{}", e);
337337
Default::default()
338-
}
338+
},
339339
},
340340
);
341341
let w = w.map(|val| match get_token_float(&val) {
342342
Ok(s) => s,
343343
Err(e) => {
344344
log::error!("{}", e);
345345
Default::default()
346-
}
346+
},
347347
});
348348
(x, y, z, w).into()
349349
},
@@ -367,21 +367,21 @@ pub(crate) fn parse_vertex_normal(input: &[Token]) -> IResult<&[Token], Normal>
367367
Err(e) => {
368368
log::error!("{}", e);
369369
Default::default()
370-
}
370+
},
371371
},
372372
match get_token_float(&y) {
373373
Ok(s) => s,
374374
Err(e) => {
375375
log::error!("{}", e);
376376
Default::default()
377-
}
377+
},
378378
},
379379
match get_token_float(&z) {
380380
Ok(s) => s,
381381
Err(e) => {
382382
log::error!("{}", e);
383383
Default::default()
384-
}
384+
},
385385
},
386386
);
387387
(x, y, z).into()
@@ -405,21 +405,21 @@ pub(crate) fn parse_vertex_texture(input: &[Token]) -> IResult<&[Token], Texture
405405
Err(e) => {
406406
log::error!("{}", e);
407407
Default::default()
408-
}
408+
},
409409
};
410410
let v = v.map(|val| match get_token_float(&val) {
411411
Ok(s) => s,
412412
Err(e) => {
413413
log::error!("{}", e);
414414
Default::default()
415-
}
415+
},
416416
});
417417
let w = w.map(|val| match get_token_float(&val) {
418418
Ok(s) => s,
419419
Err(e) => {
420420
log::error!("{}", e);
421421
Default::default()
422-
}
422+
},
423423
});
424424
(u, v, w).into()
425425
},
@@ -448,15 +448,15 @@ pub(crate) fn parse_face(input: &[Token]) -> IResult<&[Token], Face> {
448448
Err(e) => {
449449
log::error!("{}", e);
450450
Default::default()
451-
}
451+
},
452452
};
453453
let t = match t {
454454
Some(t) => t.map(|tex| match get_token_int(&tex) {
455455
Ok(s) => s,
456456
Err(e) => {
457457
log::error!("{}", e);
458458
Default::default()
459-
}
459+
},
460460
}),
461461
None => None,
462462
};
@@ -467,14 +467,14 @@ pub(crate) fn parse_face(input: &[Token]) -> IResult<&[Token], Face> {
467467
Err(e) => {
468468
log::error!("{}", e);
469469
Default::default()
470-
}
470+
},
471471
}),
472472
None => None,
473473
};
474474
(v, t, n).into()
475475
},
476476
),
477-
Face::default(),
477+
Face::default,
478478
|mut f: Face, item: FaceElement| {
479479
f.elements.push(item);
480480
f
@@ -501,19 +501,19 @@ pub(crate) fn parse_line(input: &[Token]) -> IResult<&[Token], Line> {
501501
Err(e) => {
502502
log::error!("{}", e);
503503
Default::default()
504-
}
504+
},
505505
};
506506
let t = t.flatten().map(|tex| match get_token_int(&tex) {
507507
Ok(s) => s,
508508
Err(e) => {
509509
log::error!("{}", e);
510510
Default::default()
511-
}
511+
},
512512
});
513513
(v, t).into()
514514
},
515515
),
516-
Line::default(),
516+
Line::default,
517517
|mut f: Line, item: LineElement| {
518518
f.elements.push(item);
519519
f
@@ -531,9 +531,9 @@ pub(crate) fn parse_point(input: &[Token]) -> IResult<&[Token], Point> {
531531
Err(e) => {
532532
log::error!("{}", e);
533533
Default::default()
534-
}
534+
},
535535
}),
536-
Point::default(),
536+
Point::default,
537537
|mut f: Point, item: i32| {
538538
f.elements.push(item);
539539
f
@@ -553,7 +553,7 @@ pub(crate) fn parse_group(input: &[Token]) -> IResult<&[Token], ModelElement> {
553553
Err(e) => {
554554
log::error!("{}", e);
555555
Default::default()
556-
}
556+
},
557557
},
558558
)),
559559
),
@@ -572,7 +572,7 @@ pub(crate) fn parse_mat_lib(input: &[Token]) -> IResult<&[Token], ModelElement>
572572
Err(e) => {
573573
log::error!("{}", e);
574574
Default::default()
575-
}
575+
},
576576
},
577577
)),
578578
),
@@ -592,7 +592,7 @@ pub(crate) fn parse_material(input: &[Token]) -> IResult<&[Token], ModelElement>
592592
Err(e) => {
593593
log::error!("{}", e);
594594
Default::default()
595-
}
595+
},
596596
};
597597

598598
ModelElement::Material(res)
@@ -612,7 +612,7 @@ pub(crate) fn parse_obj_name(input: &[Token]) -> IResult<&[Token], ModelElement>
612612
Err(e) => {
613613
log::error!("{}", e);
614614
Default::default()
615-
}
615+
},
616616
};
617617
ModelElement::ObjName(res)
618618
},
@@ -631,7 +631,7 @@ pub(crate) fn parse_smoothing(input: &[Token]) -> IResult<&[Token], ModelElement
631631
Err(e) => {
632632
log::error!("{}", e);
633633
Default::default()
634-
}
634+
},
635635
};
636636
if !val {
637637
Token::Int(0)
@@ -648,7 +648,7 @@ pub(crate) fn parse_smoothing(input: &[Token]) -> IResult<&[Token], ModelElement
648648
Err(e) => {
649649
log::error!("{}", e);
650650
Default::default()
651-
}
651+
},
652652
};
653653
ModelElement::Smoothing(res)
654654
},
@@ -664,7 +664,7 @@ pub(crate) fn parse_bevel(input: &[Token]) -> IResult<&[Token], ModelElement> {
664664
Err(e) => {
665665
log::error!("{}", e);
666666
Default::default()
667-
}
667+
},
668668
};
669669

670670
if let Ok(flag) = res.parse::<bool>() {
@@ -685,7 +685,7 @@ pub(crate) fn parse_c_interp(input: &[Token]) -> IResult<&[Token], ModelElement>
685685
Err(e) => {
686686
log::error!("{}", e);
687687
Default::default()
688-
}
688+
},
689689
};
690690

691691
if let Ok(flag) = res.parse::<bool>() {
@@ -706,7 +706,7 @@ pub(crate) fn parse_d_interp(input: &[Token]) -> IResult<&[Token], ModelElement>
706706
Err(e) => {
707707
log::error!("{}", e);
708708
Default::default()
709-
}
709+
},
710710
};
711711

712712
if let Ok(flag) = res.parse::<bool>() {
@@ -727,7 +727,7 @@ pub(crate) fn parse_lod(input: &[Token]) -> IResult<&[Token], ModelElement> {
727727
Err(e) => {
728728
log::error!("{}", e);
729729
Default::default()
730-
}
730+
},
731731
};
732732
ModelElement::Lod(res)
733733
},
@@ -746,7 +746,7 @@ pub(crate) fn parse_shadow_obj(input: &[Token]) -> IResult<&[Token], ModelElemen
746746
Err(e) => {
747747
log::error!("{}", e);
748748
Default::default()
749-
}
749+
},
750750
};
751751

752752
ModelElement::ShadowObj(res)
@@ -766,7 +766,7 @@ pub(crate) fn parse_trace_obj(input: &[Token]) -> IResult<&[Token], ModelElement
766766
Err(e) => {
767767
log::error!("{}", e);
768768
Default::default()
769-
}
769+
},
770770
};
771771

772772
ModelElement::TraceObj(res)
@@ -784,7 +784,7 @@ pub(crate) fn parse_texture_lib(input: &[Token]) -> IResult<&[Token], ModelEleme
784784
Err(e) => {
785785
log::error!("{}", e);
786786
Default::default()
787-
}
787+
},
788788
};
789789

790790
res
@@ -806,7 +806,7 @@ pub(crate) fn parse_texture_map(input: &[Token]) -> IResult<&[Token], ModelEleme
806806
Err(e) => {
807807
log::error!("{}", e);
808808
Default::default()
809-
}
809+
},
810810
};
811811

812812
ModelElement::TextureMap(res)

0 commit comments

Comments
 (0)