From e93163fc57a364414f50ba8ed6ea15841e3fd080 Mon Sep 17 00:00:00 2001
From: Yuxiang Cao <yuxiang.cao@fortanix.com>
Date: Wed, 26 Apr 2023 13:10:17 -0700
Subject: [PATCH] resolve rebase conflict

---
 Cargo.lock | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f0b4ffc2..2ceca691 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -976,7 +976,7 @@ dependencies = [
  "shiplift",
  "tempfile",
  "tokio 1.16.1",
- "url 2.1.1",
+ "url 2.2.2",
 ]
 
 [[package]]
@@ -1448,7 +1448,7 @@ dependencies = [
  "http 0.2.5",
  "indexmap",
  "slab",
- "tokio 1.14.0",
+ "tokio 1.16.1",
  "tokio-util",
  "tracing",
 ]
@@ -1694,7 +1694,7 @@ dependencies = [
  "bytes 1.1.0",
  "hyper 0.14.15",
  "native-tls",
- "tokio 1.14.0",
+ "tokio 1.16.1",
  "tokio-native-tls",
 ]
 
@@ -1736,7 +1736,7 @@ dependencies = [
  "sgx_pkix",
  "sgxs",
  "sgxs-loaders",
- "tokio 1.14.0",
+ "tokio 1.16.1",
  "url 2.2.2",
 ]
 
@@ -3235,7 +3235,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded 0.7.1",
- "tokio 1.14.0",
+ "tokio 1.16.1",
  "tokio-native-tls",
  "url 2.2.2",
  "wasm-bindgen",
@@ -3686,7 +3686,7 @@ dependencies = [
  "serde_json",
  "tar",
  "tokio 1.16.1",
- "url 2.1.1",
+ "url 2.2.2",
 ]
 
 [[package]]
@@ -3969,6 +3969,7 @@ version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
 dependencies = [
+ "bytes 1.1.0",
  "libc",
  "memchr",
  "mio 0.7.14",
@@ -4049,7 +4050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.14.0",
+ "tokio 1.16.1",
 ]
 
 [[package]]
@@ -4146,7 +4147,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "pin-project-lite 0.2.7",
- "tokio 1.14.0",
+ "tokio 1.16.1",
  "tracing",
 ]