From 3c895666e13a9b9aa09b16d334c53a6130b68231 Mon Sep 17 00:00:00 2001
From: Bastien Orivel <eijebong@bananium.fr>
Date: Sun, 19 Apr 2020 13:52:17 +0200
Subject: [PATCH] Dedupe the dirs dependency

---
 Cargo.lock                   | 14 ++------------
 components/config/Cargo.toml |  2 +-
 servo-tidy.toml              |  1 -
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4cab8f65ada..bf024a4c5b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1227,16 +1227,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "dirs"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a76dd8b997af7107d0bb69d43903cf37153a18266f8b3fdb9911f28efb5444"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "dirs"
 version = "2.0.2"
@@ -1555,7 +1545,7 @@ dependencies = [
  "core-foundation 0.7.0",
  "core-graphics 0.19.0",
  "core-text 15.0.0",
- "dirs 2.0.2",
+ "dirs",
  "dwrote 0.9.0",
  "euclid",
  "float-ord",
@@ -5216,7 +5206,7 @@ dependencies = [
 name = "servo_config"
 version = "0.0.1"
 dependencies = [
- "dirs 1.0.2",
+ "dirs",
  "embedder_traits",
  "euclid",
  "getopts",
diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml
index f930b60a5d3..02705717940 100644
--- a/components/config/Cargo.toml
+++ b/components/config/Cargo.toml
@@ -31,4 +31,4 @@ servo_config_plugins = { path = "../config_plugins" }
 std_test_override = { path = "../std_test_override" }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-dirs = "1.0"
+dirs = "2.0.2"
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 8fc5387d24a..65f3274ec2c 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -53,7 +53,6 @@ packages = [
   "core-foundation-sys",
   "core-graphics",
   "core-text",
-  "dirs",
   "lyon_geom",
 ]
 # Files that are ignored for all tidy and lint checks.