Skip to content

Commit cb800d2

Browse files
committed
Update hitman-commons
1 parent 9e547f0 commit cb800d2

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,7 +3295,6 @@ pub fn convert_to_qn(
32953295
) -> Result<Entity> {
32963296
let pool = rayon::ThreadPoolBuilder::new().build()?;
32973297
pool.install(|| {
3298-
log::trace!("Checking duplicate IDs");
32993298
{
33003299
let mut unique = blueprint.sub_entities.to_owned();
33013300
unique.dedup_by_key(|x| x.entity_id);
@@ -3305,7 +3304,6 @@ pub fn convert_to_qn(
33053304
}
33063305
}
33073306

3308-
log::trace!("Initial entity conversion");
33093307
let mut entity = Entity {
33103308
factory_hash: factory_meta.hash_value.to_owned(),
33113309
blueprint_hash: blueprint_meta.hash_value.to_owned(),
@@ -3612,7 +3610,6 @@ pub fn convert_to_qn(
36123610
comments: vec![]
36133611
};
36143612

3615-
log::trace!("Extra factory depends");
36163613
{
36173614
let depends = get_factory_dependencies(&entity)?;
36183615

@@ -3646,7 +3643,6 @@ pub fn convert_to_qn(
36463643
.collect();
36473644
}
36483645

3649-
log::trace!("Extra blueprint depends");
36503646
{
36513647
let depends = get_blueprint_dependencies(&entity);
36523648

@@ -3680,7 +3676,6 @@ pub fn convert_to_qn(
36803676
.collect();
36813677
}
36823678

3683-
log::trace!("Pin connections");
36843679
for pin in &blueprint.pin_connections {
36853680
let relevant_sub_entity = entity
36863681
.entities
@@ -3733,7 +3728,6 @@ pub fn convert_to_qn(
37333728
});
37343729
}
37353730

3736-
log::trace!("Pin connection overrides");
37373731
for pin_connection_override in blueprint
37383732
.pin_connection_overrides
37393733
.iter()
@@ -3787,7 +3781,6 @@ pub fn convert_to_qn(
37873781
}
37883782

37893783
// cheeky bit of code duplication right here
3790-
log::trace!("Input pin forwardings");
37913784
for forwarding in &blueprint.input_pin_forwardings {
37923785
let relevant_sub_entity = entity
37933786
.entities
@@ -3840,7 +3833,6 @@ pub fn convert_to_qn(
38403833
});
38413834
}
38423835

3843-
log::trace!("Output pin forwardings");
38443836
for forwarding in &blueprint.output_pin_forwardings {
38453837
let relevant_sub_entity = entity
38463838
.entities
@@ -3893,7 +3885,6 @@ pub fn convert_to_qn(
38933885
});
38943886
}
38953887

3896-
log::trace!("Subsets");
38973888
for sub_entity in &blueprint.sub_entities {
38983889
for (subset, data) in &sub_entity.entity_subsets {
38993890
for subset_entity in &data.entities {
@@ -3924,7 +3915,6 @@ pub fn convert_to_qn(
39243915
}
39253916
}
39263917

3927-
log::trace!("Property overrides");
39283918
let mut pass1: Vec<PropertyOverride> = Vec::default();
39293919

39303920
for property_override in &factory.property_overrides {
@@ -4007,7 +3997,6 @@ pub fn convert_to_rt(
40073997
.map(|(x, y)| -> Result<_> { Ok((normalise_entity_id(y)?, x)) })
40083998
.collect::<Result<_>>()?;
40093999

4010-
log::trace!("Initialisation");
40114000
let mut factory = resourcelib::EntityFactory {
40124001
sub_type: match entity.sub_type {
40134002
SubType::Brick => 2,
@@ -4281,7 +4270,6 @@ pub fn convert_to_rt(
42814270
.map(|(x, y)| (y.hash.to_owned(), x.to_owned()))
42824271
.collect();
42834272

4284-
log::trace!("Property overrides");
42854273
factory.property_overrides = entity
42864274
.property_overrides
42874275
.par_iter()
@@ -4332,7 +4320,6 @@ pub fn convert_to_rt(
43324320
})
43334321
.collect::<Result<_>>()?;
43344322

4335-
log::trace!("Factory subentities");
43364323
factory.sub_entities = entity
43374324
.entities
43384325
.iter()
@@ -4415,7 +4402,6 @@ pub fn convert_to_rt(
44154402
})
44164403
.collect::<Result<_>>()?;
44174404

4418-
log::trace!("Blueprint subentities");
44194405
blueprint.sub_entities = entity
44204406
.entities
44214407
.iter()
@@ -4537,7 +4523,6 @@ pub fn convert_to_rt(
45374523
})
45384524
.collect::<Result<_>>()?;
45394525

4540-
log::trace!("Subsets");
45414526
for (entity_index, (_, sub_entity)) in entity.entities.iter().enumerate() {
45424527
if sub_entity.subsets.is_some() {
45434528
for (subset, ents) in sub_entity.subsets.as_ref().ctx?.iter() {
@@ -4567,7 +4552,6 @@ pub fn convert_to_rt(
45674552
}
45684553
}
45694554

4570-
log::trace!("Pin connections");
45714555
blueprint.pin_connections = entity
45724556
.entities
45734557
.iter()
@@ -4597,7 +4581,6 @@ pub fn convert_to_rt(
45974581
.collect();
45984582

45994583
// slightly less code duplication than there used to be
4600-
log::trace!("Input pin forwardings");
46014584
blueprint.input_pin_forwardings = entity
46024585
.entities
46034586
.iter()
@@ -4626,7 +4609,6 @@ pub fn convert_to_rt(
46264609
.flatten()
46274610
.collect();
46284611

4629-
log::trace!("Output pin forwardings");
46304612
blueprint.output_pin_forwardings = entity
46314613
.entities
46324614
.iter()

0 commit comments

Comments
 (0)