Fix crates.io badge and update formatting

Cargo.toml

@@ -4,9 +4,9 @@ version = "0.8.3"
 description = "A multimap implementation."
 readme = "README.md"
 repository = "https://github.com/havarnov/multimap"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 authors = ["Håvar Nøvik <havar.novik@gmail.com>"]
-documentation = "https://docs.rs/multimap/"
+documentation = "https://docs.rs/multimap"
 exclude = [
     ".github/**",
     ".gitignore",
@@ -17,7 +17,7 @@ serde_impl = ["serde"]
 default = ["serde_impl"]
 
 [dependencies]
-serde = { version = "~1.0", optional = true }
+serde = { version = "1.0", optional = true }
 
 [dev-dependencies]
-serde_test = "~1.0"
+serde_test = "1.0"

README.md

@@ -1,5 +1,5 @@
-[![crates.io](http://meritbadge.herokuapp.com/multimap)](https://crates.io/crates/multimap)
-[![docs.rs](https://docs.rs/multimap/badge.svg)](https://docs.rs/multimap/)
+[![crates.io](https://img.shields.io/crates/v/multimap.svg)](https://crates.io/crates/multimap)
+[![docs.rs](https://docs.rs/multimap/badge.svg)](https://docs.rs/multimap)
 
 # Multimap implementation for Rust
 
@@ -30,7 +30,8 @@ fn main () {
 
 ### 0.8.3
 
-* `multimap!` macro fixes; allow trailing comma, naming hygiene and create with enough capacity for all elements.
+* `multimap!` macro fixes; allow trailing comma, naming hygiene and create with
+  enough capacity for all elements.
 
 ### 0.8.2
 
@@ -42,23 +43,26 @@ fn main () {
 
 ### 0.8.0
 
-* Added ```MultiMap::insert_many```
-* Added ```MultiMap::insert_many_from_slice```
+* Added ```MultiMap::insert_many```.
+* Added ```MultiMap::insert_many_from_slice```.
 
 ### 0.7.0
 
-* Added possibility to replace the default hasher for the underlying ```HashMap```.
+* Added possibility to replace the default hasher for the underlying
+  ```HashMap```.
 * Fix build warning by removing an unnecessary ```mut```.
 
 ## License
 
 Licensed under either of
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
+   https://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   https://opensource.org/licenses/MIT)
 at your option.
 
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.

src/entry.rs

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 multimap developers
 //
 // Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0> or the MIT
+// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. All files in the project carrying such notice may not be copied,
 // modified, or distributed except according to those terms.
 

src/lib.rs

@@ -2,8 +2,8 @@
 // Copyright (c) 2016 multimap developers
 //
 // Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0> or the MIT
+// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. All files in the project carrying such notice may not be copied,
 // modified, or distributed except according to those terms.
 

src/serde.rs

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 multimap developers
 //
 // Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-// license <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// <LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0> or the MIT
+// license <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. All files in the project carrying such notice may not be copied,
 // modified, or distributed except according to those terms.