Backed out changeset 6762fd57aa0f (bug 1769901) for causing build bustages. CLOSED TREE (1022fa60) · Commits · clairehurst / Tor Browser

Cargo.lock

+167 −167

File changed.

Preview size limit exceeded, changes collapsed.

third_party/rust/anyhow/.cargo-checksum.json

+1 −1

Original line number	Diff line number	Diff line
		{"files":{"Cargo.toml":"bb77e71078c35dd4bcf7347f36146d5952addb80749a4f72752421e7c022b9a3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"5a60bd1fe1717c044c7ab34c062ce6651c0cb08596a5878e391c2755ecac07f9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"ba404f1708d41a267f8678858aebefadc8fae717bd5533e5ebb47e219aa44f7e","src/error.rs":"6c5b1357eedd6f2be1fdaee1be645a33e68c945c481d6ff20b98c8fdedea687a","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"8c78c195027482d3403276149fc85bab6ae934c3568357b91b7b399aabf55baf","src/macros.rs":"0381ec8981e5ad1a21c67831bb11d46b8994fc82c4b8b98ad1917f5d83acb359","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"bd793da08a4d01b8211646d82bec73468e54f6caf5f520617519a12cbb6659b9","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/must-use.rs":"fb59860b43f673bf4a430a6036ba463e95028844d8dd4243cfe5ebc7f2be582f","tests/ui/must-use.stderr":"4dc15f52c3a186251c948b6a2955b777ed3c88e5da94b887f8ff945b3ecd8cee","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"0af22519410b6420e34d7b5bb387d21951013bdd5faced5fd1eff142742cf68e","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"}
		No newline at end of file
		{"files":{"Cargo.toml":"ce2fb7f23073f4f0bd58bae44baab86fa6c3d3595f32d28b410ec52394b3f64c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f6bffe3676b128afe14aaf91c972d69c37f2e5afe4e02b99a974f7b7393f4cda","build.rs":"b6ee548cb30aba0a4a7ff92379478fcf94ef246b892da8e2134ee2d9575bf08c","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"5a60bd1fe1717c044c7ab34c062ce6651c0cb08596a5878e391c2755ecac07f9","src/chain.rs":"6edefc5f3c7d69683095862e54e3bb56faba5b3387bf2eeaed429da090007a0a","src/context.rs":"559478ae785ce913523aa21358cc1561ef4b0b95c5c87675a77890364c0162fe","src/ensure.rs":"98b2f4a7923e06cf6558b0a15f39a7c7ff3d36711e217475c6a93690cd58b7a1","src/error.rs":"33a0f6c49d2c5d08b8d027aa930be75ece822331d6e6b28db74520ea69587cbc","src/fmt.rs":"c2d4aad6ce20625a70a7c091e3087b6a2c19a4a87c7a12edb4c98978307245ea","src/kind.rs":"b21b15dbee77d50abe88684a9571b39659076465dd4b1956f366af8fdd26e95a","src/lib.rs":"330286a28b4d4da255db38bc267da17fb03f2333ea26684f82124973ffcaea43","src/macros.rs":"5a735a3fa919de58729be54976678c0a386e8e9af947987f17fd988c531974c7","src/ptr.rs":"f4e28bc9feba1e84160ca9d185008a51b5d72e168e6546f3e942f4258c361e19","src/wrapper.rs":"1229beca67dbd95ca77c9ecce282272acc55276c267c58cb73a75388b4693dda","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"981e792db353be2f14c7a1cabe43b5f1329c168cb7679077cc2be786a0920d48","tests/test_backtrace.rs":"0e50edbb33b6bd07ba89ff3db72fb7c688ba2a4371fccdbbb20309ab02948b6a","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"d5e90e3eba58abc60d241d3aade39e0b8d4006d9a14f3cf015d3d925160b5812","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"ce8438cb58a1b7f3599740c261f6ef05855127ccde20c83c82db15eaf51c57ad","tests/test_ensure.rs":"f8bc5174219da947e6292891864f35307d5c400fd5690f51d574edaa5e39b8a4","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"17572596f257aac9aa2ec4620e292ca6a954128b94772bb948399fab53832e70","tests/test_macros.rs":"3f808b3050fc2b18c5b9058fe71b6b464d70e3658ff9b1daa379cd58c6874296","tests/test_repr.rs":"dbb9b04ddbe1ab31eb5331ea69f05bb3a147299da2275a3d4dcc92947b5591b9","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"0fa39de3edadb86382d8cd147c2640771e080338be2f4b067650258e3150f181","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"9d2d9cdf441f1c4a0ccbc4a7433013166425b98cd8dd8738381e8fd070c1aed9","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"64e448b6759cf51d41b1360307a638452bbe53ffa706f93e4a503b712d7b89a8","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"}
		No newline at end of file

third_party/rust/anyhow/Cargo.toml

+2 −8

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		edition = "2018"
		rust-version = "1.38"
		name = "anyhow"
		version = "1.0.57"
		version = "1.0.52"
		authors = ["David Tolnay <dtolnay@gmail.com>"]
		description = "Flexible concrete Error type built on std::error::Error"
		documentation = "https://docs.rs/anyhow"
		@@ -21,18 +21,12 @@ readme = "README.md"
		categories = ["rust-patterns"]
		license = "MIT OR Apache-2.0"
		repository = "https://github.com/dtolnay/anyhow"

		[package.metadata.docs.rs]
		rustdoc-args = ["--cfg", "doc_cfg"]
		targets = ["x86_64-unknown-linux-gnu"]
		rustdoc-args = [
		"--cfg",
		"doc_cfg",
		]

		[dependencies.backtrace]
		version = "0.3.51"
		optional = true

		[dev-dependencies.futures]
		version = "0.3"
		default-features = false

third_party/rust/anyhow/src/ensure.rs

+3 −19

Original line number	Diff line number	Diff line
		@@ -257,10 +257,6 @@ macro_rules! __parse_ensure {
		$crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)) {($($buf) $colons <) $($parse)} (< $($rest)) < $($rest)*)
		};

		(epath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($colons:tt $($dup:tt)) :: <- $($rest:tt)*) => {
		$crate::__parse_ensure!(generic (epath $stack) $bail ($($fuel)) {($($buf) $colons <) $($parse)} (- $($rest)) - $($rest)*)
		};

		(epath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($colons:tt $($dup:tt)) :: $ident:ident $($rest:tt)*) => {
		$crate::__parse_ensure!(epath $stack $bail ($($fuel)) {($($buf) $colons $ident) $($parse)} ($($rest)) $($rest)*)
		};
		@@ -307,10 +303,6 @@ macro_rules! __parse_ensure {
		$crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)) {($($buf) $dot $ident $colons <) $($parse)} (< $($rest)) < $($rest)*)
		};

		(atom $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($dot:tt $ident:tt $colons:tt $($dup:tt)) . $i:ident :: <- $($rest:tt)*) => {
		$crate::__parse_ensure!(generic (atom $stack) $bail ($($fuel)) {($($buf) $dot $ident $colons <) $($parse)} (- $($rest)) - $($rest)*)
		};

		(atom $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($dot:tt $($dup:tt)) . $field:ident $($rest:tt)*) => {
		$crate::__parse_ensure!(atom $stack $bail ($($fuel)) {($($buf) $dot $field) $($parse)} ($($rest)) $($rest)*)
		};
		@@ -435,10 +427,6 @@ macro_rules! __parse_ensure {
		$crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)) {($($buf) <) $($parse)} (< $($rest)) < $($rest)*)
		};

		(tpath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} $dup:tt <- $($rest:tt)) => {
		$crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)) {($($buf) <) $($parse)} (- $($rest)) - $($rest)*)
		};

		(tpath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($colons:tt $langle:tt $($dup:tt)) :: < $($rest:tt)*) => {
		$crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)) {($($buf) $colons $langle) $($parse)} ($($rest)) $($rest)*)
		};
		@@ -447,10 +435,6 @@ macro_rules! __parse_ensure {
		$crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)) {($($buf) $colons <) $($parse)} (< $($rest)) < $($rest)*)
		};

		(tpath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($colons:tt $($dup:tt)) :: <- $($rest:tt)*) => {
		$crate::__parse_ensure!(generic (tpath $stack) $bail ($($fuel)) {($($buf) $colons <) $($parse)} (- $($rest)) - $($rest)*)
		};

		(tpath $stack:tt $bail:tt (~$($fuel:tt)) {($($buf:tt)) $($parse:tt)} ($colons:tt $($dup:tt)) :: $ident:ident $($rest:tt)*) => {
		$crate::__parse_ensure!(tpath $stack $bail ($($fuel)) {($($buf) $colons $ident) $($parse)} ($($rest)) $($rest)*)
		};
		@@ -818,17 +802,17 @@ macro_rules! __fallback_ensure {
		};
		($cond:expr, $msg:literal $(,)?) => {
		if !$cond {
		return $crate::private::Err($crate::__anyhow!($msg));
		return $crate::private::Err($crate::anyhow!($msg));
		}
		};
		($cond:expr, $err:expr $(,)?) => {
		if !$cond {
		return $crate::private::Err($crate::__anyhow!($err));
		return $crate::private::Err($crate::anyhow!($err));
		}
		};
		($cond:expr, $fmt:expr, $($arg:tt)*) => {
		if !$cond {
		return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*));
		return $crate::private::Err($crate::anyhow!($fmt, $($arg)*));
		}
		};
		}

third_party/rust/anyhow/src/error.rs

+0 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ impl Error {
		#[cfg(feature = "std")]
		#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
		#[cold]
		#[must_use]
		pub fn new<E>(error: E) -> Self
		where
		E: StdError + Send + Sync + 'static,
		@@ -73,7 +72,6 @@ impl Error {
		/// }
		/// ```
		#[cold]
		#[must_use]
		pub fn msg<M>(message: M) -> Self
		where
		M: Display + Debug + Send + Sync + 'static,
		@@ -295,7 +293,6 @@ impl Error {
		/// }
		/// ```
		#[cold]
		#[must_use]
		pub fn context<C>(self, context: C) -> Self
		where
		C: Display + Send + Sync + 'static,