From 39e4de9e2b0351527c01811f922467ce62018514 Mon Sep 17 00:00:00 2001
From: Zibi Braniecki <zibi@braniecki.net>
Date: Tue, 23 Jul 2019 01:26:03 -0700
Subject: [PATCH] annotate-snippets 0.6.1

---
 CHANGELOG.md              | 4 ++++
 Cargo.toml                | 7 +++----
 README.md                 | 2 --
 examples/expected_type.rs | 2 --
 examples/footer.rs        | 2 --
 examples/format.rs        | 2 --
 examples/multislice.rs    | 2 --
 src/stylesheets/color.rs  | 4 ++--
 tests/diff/mod.rs         | 7 ++-----
 tests/dl_from_snippet.rs  | 2 --
 tests/fixtures.rs         | 7 +------
 tests/formatter.rs        | 2 --
 tests/snippet/mod.rs      | 7 ++-----
 13 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed51fed..a125e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## Unreleased
  
   - …
+
+## annotate-snippets 0.6.1 (July 23, 2019)
+
+  - Fix too many anonymized line numbers (#5)
  
 ## annotate-snippets 0.6.0 (June 26, 2019)
  
diff --git a/Cargo.toml b/Cargo.toml
index 05c073e..35c8aae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "annotate-snippets"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2018"
 authors = ["Zibi Braniecki <gandalf@mozilla.com>"]
 description = "Library for building code annotations"
@@ -21,10 +21,9 @@ ansi_term = { version = "0.11.0", optional = true }
 [dev-dependencies]
 glob = "^0.3"
 serde_yaml = "^0.8"
-serde = "^1.0"
-serde_derive = "^1.0"
+serde = { version = "^1.0", features = ["derive"] }
 difference = "^2.0"
-ansi_term = "^0.11"
+ansi_term = "^0.12"
 
 [features]
 default = []
diff --git a/README.md b/README.md
index eb9a6e9..a690007 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,6 @@ Usage
 -----
 
 ```rust
-extern crate annotate_snippets;
-
 use annotate_snippets::snippet;
 
 fn main() {
diff --git a/examples/expected_type.rs b/examples/expected_type.rs
index 6ad3c36..20cda66 100644
--- a/examples/expected_type.rs
+++ b/examples/expected_type.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
diff --git a/examples/footer.rs b/examples/footer.rs
index 1814be1..1b03910 100644
--- a/examples/footer.rs
+++ b/examples/footer.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
diff --git a/examples/format.rs b/examples/format.rs
index d6a77ae..7e41802 100644
--- a/examples/format.rs
+++ b/examples/format.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation};
diff --git a/examples/multislice.rs b/examples/multislice.rs
index 47981b7..af1cb15 100644
--- a/examples/multislice.rs
+++ b/examples/multislice.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
 use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet};
diff --git a/src/stylesheets/color.rs b/src/stylesheets/color.rs
index b2b5762..f0a5d9c 100644
--- a/src/stylesheets/color.rs
+++ b/src/stylesheets/color.rs
@@ -12,7 +12,7 @@ impl Style for AnsiTermStyleWrapper {
         format!("{}", self.style.paint(text))
     }
 
-    fn bold(&self) -> Box<Style> {
+    fn bold(&self) -> Box<dyn Style> {
         Box::new(AnsiTermStyleWrapper {
             style: self.style.clone(),
         })
@@ -22,7 +22,7 @@ impl Style for AnsiTermStyleWrapper {
 pub struct AnsiTermStylesheet {}
 
 impl Stylesheet for AnsiTermStylesheet {
-    fn get_style(&self, class: StyleClass) -> Box<Style> {
+    fn get_style(&self, class: StyleClass) -> Box<dyn Style> {
         let ansi_term_style = match class {
             StyleClass::Error => Fixed(9).bold(),
             StyleClass::Warning => Fixed(11).bold(),
diff --git a/tests/diff/mod.rs b/tests/diff/mod.rs
index b5eb362..7032e71 100644
--- a/tests/diff/mod.rs
+++ b/tests/diff/mod.rs
@@ -1,8 +1,5 @@
-extern crate ansi_term;
-extern crate difference;
-
-use self::ansi_term::Color::{Black, Green, Red};
-use self::difference::{Changeset, Difference};
+use ansi_term::Color::{Black, Green, Red};
+use difference::{Changeset, Difference};
 
 pub fn get_diff(left: &str, right: &str) -> String {
     let mut output = String::new();
diff --git a/tests/dl_from_snippet.rs b/tests/dl_from_snippet.rs
index db47bea..2eb0313 100644
--- a/tests/dl_from_snippet.rs
+++ b/tests/dl_from_snippet.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list as dl;
 use annotate_snippets::snippet;
 
diff --git a/tests/fixtures.rs b/tests/fixtures.rs
index b6fc147..e103b84 100644
--- a/tests/fixtures.rs
+++ b/tests/fixtures.rs
@@ -1,12 +1,6 @@
 mod diff;
 mod snippet;
 
-extern crate annotate_snippets;
-extern crate glob;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_yaml;
-
 use crate::snippet::SnippetDef;
 use annotate_snippets::display_list::DisplayList;
 use annotate_snippets::formatter::DisplayListFormatter;
@@ -17,6 +11,7 @@ use std::fs::File;
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
+use serde::Deserialize;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
     let mut f = File::open(path)?;
diff --git a/tests/formatter.rs b/tests/formatter.rs
index 844c358..9d224e9 100644
--- a/tests/formatter.rs
+++ b/tests/formatter.rs
@@ -1,5 +1,3 @@
-extern crate annotate_snippets;
-
 use annotate_snippets::display_list::*;
 use annotate_snippets::formatter::DisplayListFormatter;
 
diff --git a/tests/snippet/mod.rs b/tests/snippet/mod.rs
index 15e4f8a..a08e3fc 100644
--- a/tests/snippet/mod.rs
+++ b/tests/snippet/mod.rs
@@ -1,9 +1,6 @@
-extern crate annotate_snippets;
-extern crate serde;
+use serde::{Serialize, Deserialize, Deserializer};
 
-use self::serde::de::{Deserialize, Deserializer};
-
-use self::annotate_snippets::snippet::{
+use annotate_snippets::snippet::{
     Annotation, AnnotationType, Slice, Snippet, SourceAnnotation,
 };