Merge 5aaf65a into 6856233

.rustfmt.toml

@@ -0,0 +1,67 @@
+max_width = 90 # changed
+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 = true # changed
+normalize_doc_attributes = false
+# license_template_path = "LICENSE_TEMPLATE" # changed
+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 = "Vertical" # changed
+merge_imports = true # changed
+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 = false # changed
+overflow_delimited_expr = false
+struct_field_align_threshold = 0
+enum_discrim_align_threshold = 0
+match_arm_blocks = true
+force_multiline_blocks = true # changed
+fn_args_layout = "Tall"
+brace_style = "SameLineWhere"
+control_brace_style = "AlwaysSameLine"
+trailing_semicolon = false # changed
+trailing_comma = "Vertical"
+match_block_trailing_comma = false
+blank_lines_upper_bound = 1
+blank_lines_lower_bound = 0
+edition = "2018" # changed
+version = "One"
+merge_derives = true
+use_try_shorthand = true # changed
+use_field_init_shorthand = true # changed
+force_explicit_abi = true
+condense_wildcard_suffixes = false
+color = "Auto"
+unstable_features = true # changed
+disable_all_formatting = false
+skip_children = false
+hide_parse_errors = false
+error_on_line_overflow = false
+error_on_unformatted = false
+report_todo = "Always"
+report_fixme = "Always"
+ignore = []
+
+# Below are `rustfmt` internal settings
+#
+# emit_mode = "Files"
+# make_backup = false

Cargo.toml

@@ -1,30 +1,36 @@
 [package]
 name = "string-interner"
-version = "0.7.1"
+version = "0.8.0"
 authors = ["Robbepop"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/robbepop/string-interner"
 documentation = "https://docs.rs/string-interner"
 keywords = ["interner", "intern", "string", "str", "symbol"]
-description = """An efficient string interning data structure with minimal memory-footprint
-and fast access to the underlying contents.
+description = """Efficient string interner with minimal memory footprint
+and fast access to the underlying strings.
 """
 categories = ["data-structures"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0.0", optional = true }
+cfg-if = "0.1"
+serde = { version = "1.0", optional = true }
+hashbrown = { version = "0.8", optional = true }
 
 [dev-dependencies]
-fnv = "1.0.0" # required bench tests
-serde_json = "1.0.0" # required for testing the serde imlementation
-lazy_static = "1.0.0" # required for bench tests
+serde_json = "1.0"
+criterion = "0.3"
+
+[[bench]]
+name = "bench"
+harness = false
 
 [features]
-default       = ["serde_support"]
-bench         = []
-serde_support = ["serde"]
+default = ["std", "serde-1"]
+std = []
+bench = ["std"]
+serde-1 = ["serde"]
 
 [badges]
 travis-ci = { repository = "Robbepop/string-interner" }

LICENSE-APACHE

@@ -1,6 +1,6 @@
 APACHE License
 
-Copyright 2017 Robin Freyler
+Copyright 2020 Robin Freyler
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

LICENSE-MIT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 by Robin Freyler
+Copyright (c) 2020 by Robin Freyler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal