Merge remote-tracking branch 'origin/master' into feature/minimal-crate-metadata-api

nightkr · nightkr · commit 0bb780b3c484 · 2022-02-11T15:38:02.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,7 +59,7 @@ futures-channel = { version = "=0.3.21", default-features = false }
 futures-util = "=0.3.21"
 hex = "=0.4.3"
 http = "=0.2.6"
-hyper = { version = "=0.14.16", features = ["client", "http1"] }
+hyper = { version = "=0.14.17", features = ["client", "http1"] }
 indexmap = { version = "=1.8.0", features = ["serde-1"] }
 tikv-jemallocator = { version = "=0.4.1", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 lettre = { version = "=0.10.0-rc.4", default-features = false, features = ["file-transport", "smtp-transport", "native-tls", "hostname", "builder"] }
diff --git a/cargo-registry-markdown/lib.rs b/cargo-registry-markdown/lib.rs
@@ -267,7 +267,7 @@ pub fn text_to_html(
         }
     }
 
-    encode_minimal(text).replace("\n", "<br>\n")
+    encode_minimal(text).replace('\n', "<br>\n")
 }
 
 /// Helper function to build a new `HashSet` from the items slice.
diff --git a/package.json b/package.json
@@ -57,9 +57,9 @@
     "@ember/render-modifiers": "2.0.4",
     "@ember/test-helpers": "2.6.0",
     "@ember/test-waiters": "3.0.1",
-    "@embroider/compat": "1.1.0",
-    "@embroider/core": "1.1.0",
-    "@embroider/webpack": "1.1.0",
+    "@embroider/compat": "1.2.0",
+    "@embroider/core": "1.2.0",
+    "@embroider/webpack": "1.2.0",
     "@glimmer/component": "1.0.4",
     "@glimmer/tracking": "1.0.4",
     "@percy/cli": "1.0.0-beta.74",
diff --git a/script/init-local-index.sh b/script/init-local-index.sh
@@ -11,10 +11,10 @@ mkdir -p tmp
 rm -rf tmp/index-bare tmp/index-tmp
 
 echo "Initializing repository in tmp/index-bare..."
-git init -q --bare tmp/index-bare
+git init -q --bare --initial-branch=master tmp/index-bare
 
 echo "Creating temporary clone in tmp/index-tmp..."
-git init -q tmp/index-tmp
+git init -q --initial-branch=master tmp/index-tmp
 cd tmp/index-tmp
 cat > config.json <<-EOF
 {
diff --git a/src/tests/record.rs b/src/tests/record.rs
@@ -247,7 +247,7 @@ async fn record_http(req: Request<Body>, client: Client) -> Result<ResponseAndEx
             .iter()
             .map(|h| (h.0.as_str().to_string(), h.1.to_str().unwrap().to_string()))
             .collect(),
-        body: base64::encode(&body.to_vec()),
+        body: base64::encode(&body),
     };
 
     // Construct an outgoing request
@@ -273,7 +273,7 @@ async fn record_http(req: Request<Body>, client: Client) -> Result<ResponseAndEx
             .iter()
             .map(|h| (h.0.as_str().to_string(), h.1.to_str().unwrap().to_string()))
             .collect(),
-        body: base64::encode(&body.to_vec()),
+        body: base64::encode(&body),
     };
 
     // Construct an outgoing response
@@ -371,7 +371,7 @@ impl GhUser {
             return;
         }
 
-        let password = crate::env(&format!("GH_PASS_{}", self.login.replace("-", "_")));
+        let password = crate::env(&format!("GH_PASS_{}", self.login.replace('-', "_")));
         #[derive(Serialize)]
         struct Authorization {
             scopes: Vec<String>,
diff --git a/yarn.lock b/yarn.lock
@@ -1182,29 +1182,29 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@embroider/babel-loader-8@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-1.1.0.tgz#54594c1b564f5592b2e9a2332f8e9a96171afb43"
-  integrity sha512-Fw0quc/nCsGy7EAxp5iM3Twn/qs3Z9XhvyvkNtd3BsDsWmHj1TB4QGiv1HmhUz5mAS0MyJXgMQ0nCtwyI2YqPg==
+"@embroider/babel-loader-8@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/babel-loader-8/-/babel-loader-8-1.2.0.tgz#9dc7832004c095b0178d5847de3a38fefea2aa2b"
+  integrity sha512-M13kT0sKULUItmNUKILo5/cdmkgU5DuXk5ifZui7LZfADcy/7TPnuwuJv3Tda0tyXLFIgEarXnEBw0RyuJ+2Nw==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
     "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@embroider/core" "1.1.0"
+    "@embroider/core" "1.2.0"
     babel-loader "8"
 
-"@embroider/compat@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-1.1.0.tgz#0aac3cadb570f1ff03d350f266fbf599b4b9a88c"
-  integrity sha512-kQ8UMiiU83Ho2pAE8k35xdAQZGVKAFauaOHfyd0Wx2wllRaLabjFZsxVfOGeiGQ57nl1n1zzK7LeKMVDLWWnVA==
+"@embroider/compat@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-1.2.0.tgz#1abecaa6d0fda4ae14415e5081f2f4947fac76bd"
+  integrity sha512-i2swTSuKkkGke9mQ1xPjtUikgo3HqOche0g/WaZoLv2lonu8aiV+DAJCKU+r0v0x7Ivo6aIKUtw4t0/TPYWYYw==
   dependencies:
     "@babel/code-frame" "^7.14.5"
     "@babel/core" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/preset-env" "^7.14.5"
     "@babel/traverse" "^7.14.5"
-    "@embroider/macros" "1.1.0"
-    "@embroider/shared-internals" "1.1.0"
+    "@embroider/macros" "1.2.0"
+    "@embroider/shared-internals" "1.2.0"
     "@types/babel__code-frame" "^7.0.2"
     "@types/yargs" "^17.0.3"
     assert-never "^1.1.0"
@@ -1235,19 +1235,19 @@
     walk-sync "^3.0.0"
     yargs "^17.0.1"
 
-"@embroider/core@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-1.1.0.tgz#f0bb306ea0ced01a136950ad030c447ef2eef502"
-  integrity sha512-E5eIENbHNy2/o9VnxAMJNHs+BED/HW1ndM7kqgae7STx5QCLvTGddGAUCQ4tHzcUbSmv01locAsKRWujhEeOiw==
+"@embroider/core@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-1.2.0.tgz#38b842651d6654bd347ccd187941b6845b8644ff"
+  integrity sha512-Z+raixqpH3JnhRyHBj0QuekX/vJz1xz3qhJAYlLsRV5COXqzR55lZephCpQnYDs/66JegHPPIffP3v5dbmEU4A==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/parser" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-transform-runtime" "^7.14.5"
     "@babel/runtime" "^7.14.5"
     "@babel/traverse" "^7.14.5"
-    "@embroider/macros" "1.1.0"
-    "@embroider/shared-internals" "1.1.0"
+    "@embroider/macros" "1.2.0"
+    "@embroider/shared-internals" "1.2.0"
     assert-never "^1.2.1"
     babel-import-util "^1.1.0"
     babel-plugin-ember-template-compilation "^1.0.0"
@@ -1272,17 +1272,17 @@
     walk-sync "^3.0.0"
     wrap-legacy-hbs-plugin-if-needed "^1.0.1"
 
-"@embroider/hbs-loader@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-1.1.0.tgz#52e69d9738135e26059c88b51ae6f6e405fa4eee"
-  integrity sha512-1PHwPinVzILFpGyhr4etZqAcTfMcj9urvjcjjBdPi3DSQRSLWENAUGGCioH8ME4PW48mcci9PaukLyW1HfKrng==
+"@embroider/hbs-loader@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-1.2.0.tgz#73ef5ed18c22ca1ffcfeaf04e505f75ddc640eaf"
+  integrity sha512-xM/piVIQzyhZEVbwLkhZSYt8y0KOHDvY0AXoieia6VwRhNXb/P1q92qDO+uNodNRpq3/aJfkmbgWukiLjkF9rw==
 
-"@embroider/macros@1.1.0", "@embroider/macros@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.1.0.tgz#4e11a8a38be9ac20f20c9a09a8df7e97b47ede13"
-  integrity sha512-YwOKpgRjoFee7DMHFvAaE8xZVdlft0wcwGGsqW4oqiisfoHaf3YIpCDNy7aYFm9CoZseq827mxyjejxiOEmJaQ==
+"@embroider/macros@1.2.0", "@embroider/macros@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
+  integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
   dependencies:
-    "@embroider/shared-internals" "1.1.0"
+    "@embroider/shared-internals" "1.2.0"
     assert-never "^1.2.1"
     babel-import-util "^1.1.0"
     ember-cli-babel "^7.26.6"
@@ -1316,10 +1316,10 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
-"@embroider/shared-internals@1.1.0", "@embroider/shared-internals@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.1.0.tgz#ffacee101bd051610e4990dd5d819300c2a9fbab"
-  integrity sha512-dLSUcNOwkYAsLMVOrBjgOicSuXF4LPmqLu+RSNZ+cbujvisGT4r/2C/VGL0QT38MYb4zELGuTH13j9wOTBS2Kw==
+"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
+  integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
   dependencies:
     babel-import-util "^1.1.0"
     ember-rfc176-data "^0.3.17"
@@ -1329,17 +1329,17 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/webpack@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-1.1.0.tgz#13b56fea59cc83a827848af835feb33f0f5fb494"
-  integrity sha512-72nDRiLcuUqn3XpUyaGvmFbKUO+W2MDbq4wTPSHCaAUpQBLVDIvRW6IzCGWMMvlL9BoFjmMO5T6KUPbockLXmg==
+"@embroider/webpack@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-1.2.0.tgz#6bb04b34817f3154bc34c7463d3b928d0ae76ae5"
+  integrity sha512-bBVY4qpWX4rl41ss+qZZcBmDySzgH31NefaBFTQ5PvWcL71hG/9ZDWhy0V/+JzFCWT0plJkikSKeDPR+C2aImw==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
     "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@embroider/babel-loader-8" "1.1.0"
-    "@embroider/hbs-loader" "1.1.0"
-    "@embroider/shared-internals" "1.1.0"
+    "@embroider/babel-loader-8" "1.2.0"
+    "@embroider/hbs-loader" "1.2.0"
+    "@embroider/shared-internals" "1.2.0"
     "@types/source-map" "^0.5.7"
     "@types/supports-color" "^8.1.0"
     babel-loader "^8.2.2"

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ pub fn text_to_html(`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`- encode_minimal(text).replace("\n", "<br>\n")`
	`270`	`+ encode_minimal(text).replace('\n', "<br>\n")`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	/// Helper function to build a new `HashSet` from the items slice.