1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-03 15:20:05 -04:00

Update dependencies and pass all clippy's (#636)

* Cargo update

https://pastebin.com/raw/KWNuJD9u

* Cargo clippy +nightly

* Remove deprecated clippy

* Fix unbalanced backtick (now passes cargo {+nightly,} clippy)
This commit is contained in:
sigaloid
2021-08-20 16:31:20 -04:00
committed by GitHub
parent a256ca115b
commit 12fd4906de
10 changed files with 56 additions and 69 deletions

View File

@@ -157,14 +157,14 @@ impl GraphicLayers {
for layer_id in area_order {
if layer_id.order == order {
if let Some(list) = order_map.get_mut(&layer_id.id) {
all_shapes.extend(list.lock().0.drain(..));
all_shapes.append(&mut list.lock().0);
}
}
}
// Also draw areas that are missing in `area_order`:
for shapes in order_map.values_mut() {
all_shapes.extend(shapes.lock().0.drain(..));
all_shapes.append(&mut shapes.lock().0);
}
}

View File

@@ -295,7 +295,6 @@
clippy::option_option,
clippy::path_buf_push_overwrite,
clippy::ptr_as_ptr,
clippy::pub_enum_variant_names,
clippy::ref_option_ref,
clippy::rest_pat_in_fully_bound_structs,
clippy::same_functions_in_if_condition,
@@ -310,7 +309,6 @@
clippy::unused_self,
clippy::useless_transmute,
clippy::verbose_file_reads,
clippy::wrong_pub_self_convention,
clippy::zero_sized_map_values,
future_incompatible,
nonstandard_style,