From cd43db88cee00b36eb71c90fbeb60eb992407878 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 19 May 2021 09:12:30 +0200 Subject: [PATCH 1/2] Fix clippy lints Signed-off-by: Sascha Grunert --- Makefile | 1 + src/arena.rs | 18 +++++++++--------- tests/lib.rs | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5c6b4a1..70e5248 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ lint-clippy: cargo clippy -- -D warnings lint-rustfmt: + cargo fmt --version cargo fmt git diff --exit-code diff --git a/src/arena.rs b/src/arena.rs index 8a7f328..11334f9 100644 --- a/src/arena.rs +++ b/src/arena.rs @@ -47,15 +47,15 @@ impl Arena { where T: PartialEq, { - if let Some(node_id) = self.nodes.iter().position(|n| n.data == node.data) { - if let Some(node_id_non_zero) = NonZeroUsize::new(node_id.wrapping_add(1)) { - Some(NodeId::from_non_zero_usize( + if let Some(node_id) = + self.nodes.iter().position(|n| n.data == node.data) + { + NonZeroUsize::new(node_id.wrapping_add(1)).map(|node_id_non_zero| { + NodeId::from_non_zero_usize( node_id_non_zero, self.nodes[node_id].stamp, - )) - } else { - None - } + ) + }) } else { None } @@ -88,8 +88,8 @@ impl Arena { self.nodes.push(node); (index, stamp) }; - let next_index1 = - NonZeroUsize::new(index.wrapping_add(1)).expect("Too many nodes in the arena"); + let next_index1 = NonZeroUsize::new(index.wrapping_add(1)) + .expect("Too many nodes in the arena"); NodeId::from_non_zero_usize(next_index1, stamp) } diff --git a/tests/lib.rs b/tests/lib.rs index a02ff96..733ee20 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -11,7 +11,7 @@ fn success_create() { new_counter += 1; arena.new_node(new_counter) }}; - }; + } let a = new!(); // 1 assert!(a.checked_append(new!(), arena).is_ok()); // 2 From 4747f91e2430b726056e8af141a44fcb9b94c189 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 19 May 2021 09:20:09 +0200 Subject: [PATCH 2/2] Run rustfmt Signed-off-by: Sascha Grunert --- .rustfmt.toml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/arena.rs | 13 +++------- 2 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 .rustfmt.toml diff --git a/.rustfmt.toml b/.rustfmt.toml new file mode 100644 index 0000000..c9524ed --- /dev/null +++ b/.rustfmt.toml @@ -0,0 +1,68 @@ +max_width = 100 +hard_tabs = false +tab_spaces = 4 +newline_style = "Auto" +use_small_heuristics = "Default" +indent_style = "Block" +wrap_comments = false +format_code_in_doc_comments = false +comment_width = 80 +normalize_comments = false +normalize_doc_attributes = false +license_template_path = "" +format_strings = false +format_macro_matchers = false +format_macro_bodies = true +empty_item_single_line = true +struct_lit_single_line = true +fn_single_line = false +where_single_line = false +imports_indent = "Block" +imports_layout = "Mixed" +imports_granularity = "Preserve" +group_imports = "Preserve" +reorder_imports = true +reorder_modules = true +reorder_impl_items = false +type_punctuation_density = "Wide" +space_before_colon = false +space_after_colon = true +spaces_around_ranges = false +binop_separator = "Front" +remove_nested_parens = true +combine_control_expr = true +overflow_delimited_expr = false +struct_field_align_threshold = 0 +enum_discrim_align_threshold = 0 +match_arm_blocks = true +match_arm_leading_pipes = "Never" +force_multiline_blocks = false +fn_args_layout = "Tall" +brace_style = "SameLineWhere" +control_brace_style = "AlwaysSameLine" +trailing_semicolon = true +trailing_comma = "Vertical" +match_block_trailing_comma = false +blank_lines_upper_bound = 1 +blank_lines_lower_bound = 0 +edition = "2015" +version = "One" +inline_attribute_width = 0 +merge_derives = true +use_try_shorthand = false +use_field_init_shorthand = false +force_explicit_abi = true +condense_wildcard_suffixes = false +color = "Auto" +required_version = "1.4.36" +unstable_features = false +disable_all_formatting = false +skip_children = false +hide_parse_errors = false +error_on_line_overflow = false +error_on_unformatted = false +report_todo = "Never" +report_fixme = "Never" +ignore = [] +emit_mode = "Files" +make_backup = false diff --git a/src/arena.rs b/src/arena.rs index 11334f9..ff6a18f 100644 --- a/src/arena.rs +++ b/src/arena.rs @@ -47,14 +47,9 @@ impl Arena { where T: PartialEq, { - if let Some(node_id) = - self.nodes.iter().position(|n| n.data == node.data) - { + if let Some(node_id) = self.nodes.iter().position(|n| n.data == node.data) { NonZeroUsize::new(node_id.wrapping_add(1)).map(|node_id_non_zero| { - NodeId::from_non_zero_usize( - node_id_non_zero, - self.nodes[node_id].stamp, - ) + NodeId::from_non_zero_usize(node_id_non_zero, self.nodes[node_id].stamp) }) } else { None @@ -88,8 +83,8 @@ impl Arena { self.nodes.push(node); (index, stamp) }; - let next_index1 = NonZeroUsize::new(index.wrapping_add(1)) - .expect("Too many nodes in the arena"); + let next_index1 = + NonZeroUsize::new(index.wrapping_add(1)).expect("Too many nodes in the arena"); NodeId::from_non_zero_usize(next_index1, stamp) }