From 6e4f76908dd2122a59b91db64bc867e313bb4172 Mon Sep 17 00:00:00 2001
From: Austin Bonander <austin@launchbadge.com>
Date: Thu, 14 Apr 2022 15:40:46 -0700
Subject: [PATCH] rebase onto master

---
 Cargo.lock           | 31 +++++++++++++++----------------
 sqlx-core/Cargo.toml |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97b1528cc7..605d2b6b81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -989,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.13.25"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
+checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
 dependencies = [
  "bitflags",
  "libc",
@@ -1225,9 +1225,9 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.26+1.3.0"
+version = "0.13.2+1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
+checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
 dependencies = [
  "cc",
  "libc",
@@ -1447,6 +1447,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.1"
@@ -2226,18 +2237,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "simple_asn1"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31e6cf34ad4321d3a2b8f934949b429e314519f753a77962f16c664dca8e13"
-dependencies = [
- "chrono",
- "num-bigint",
- "num-traits",
- "thiserror",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.5"
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
index f217558c3d..77e49c6ff7 100644
--- a/sqlx-core/Cargo.toml
+++ b/sqlx-core/Cargo.toml
@@ -105,7 +105,7 @@ ahash = "0.7.6"
 atoi = "0.4.0"
 sqlx-rt = { path = "../sqlx-rt", version = "0.5.12"}
 base64 = { version = "0.13.0", default-features = false, optional = true, features = ["std"] }
-bigdecimal_ = { version = "0.3.2", optional = true, package = "bigdecimal" }
+bigdecimal_ = { version = "0.3.0", optional = true, package = "bigdecimal" }
 rust_decimal = { version = "1.19.0", optional = true }
 bit-vec = { version = "0.6.3", optional = true }
 bitflags = { version = "1.3.2", default-features = false }