From 788f0fee7765e77af60bb226299e1555311d0d74 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 08:20:20 +0000
Subject: [PATCH 1/2] build(deps): bump loom from 0.3.4 to 0.3.5

Bumps [loom](https://github.com/tokio-rs/loom) from 0.3.4 to 0.3.5.
- [Release notes](https://github.com/tokio-rs/loom/releases)
- [Changelog](https://github.com/tokio-rs/loom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/loom/compare/v0.3.4...v0.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Cargo.lock | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index db8019f5286..4bb2740b948 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3238,13 +3238,13 @@ dependencies = [
 
 [[package]]
 name = "loom"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
+checksum = "28e1106f2fa156410c0feb373657bd8afc9e801ab1c3e71cca22ec8faf8d5ded"
 dependencies = [
  "cfg-if",
  "generator",
- "scoped-tls 0.1.2",
+ "scoped-tls",
 ]
 
 [[package]]
@@ -4685,12 +4685,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
@@ -6526,7 +6520,7 @@ dependencies = [
  "log",
  "mime",
  "mime_guess",
- "scoped-tls 1.0.0",
+ "scoped-tls",
  "serde",
  "serde_json",
  "serde_urlencoded",

From dd5a4ec868e37cdafe8b438866877f09812fb020 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 27 Jul 2020 11:08:23 -0400
Subject: [PATCH 2/2] Remove scoped-tidy duplicate exemption.

---
 servo-tidy.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/servo-tidy.toml b/servo-tidy.toml
index 935ba0a205f..ca5c23e222d 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -44,7 +44,6 @@ packages = [
   "tokio-openssl",
   "tokio",
   "http",
-  "scoped-tls",
   "bytes",
 
   # https://github.com/servo/servo/pull/23288#issuecomment-494687746