Skip to content

Commit fcb465c

Browse files
authored
[beta-1.86] depend on openssl-sys to correctly pin its version (#15226)
Beta backports * #15224 In order to make CI pass, the following PRs are also cherry-picked: * 7e0da41
2 parents ce948f4 + c277a49 commit fcb465c

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

Cargo.lock

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ cargo-credential-macos-keychain.workspace = true
234234

235235
[target.'cfg(not(windows))'.dependencies]
236236
openssl = { workspace = true, optional = true }
237+
openssl-sys = { workspace = true, optional = true } # HACK: for pinning to openssl v1.
237238

238239
[target.'cfg(windows)'.dependencies]
239240
cargo-credential-wincred.workspace = true

tests/testsuite/global_cache_tracker.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,16 +2004,7 @@ fn compatible_with_older_cargo() {
20042004
assert_eq!(get_registry_names("src"), ["middle-1.0.0", "new-1.0.0"]);
20052005
assert_eq!(
20062006
get_registry_names("cache"),
2007-
// Duplicate crates from two different cache location
2008-
// because we're changing how SourceId is hashed.
2009-
// This change should be reverted once rust-lang/cargo#14917 lands.
2010-
[
2011-
"middle-1.0.0.crate",
2012-
"middle-1.0.0.crate",
2013-
"new-1.0.0.crate",
2014-
"new-1.0.0.crate",
2015-
"old-1.0.0.crate"
2016-
]
2007+
["middle-1.0.0.crate", "new-1.0.0.crate", "old-1.0.0.crate"]
20172008
);
20182009

20192010
// T-0 months: Current version, make sure it can read data from stable,
@@ -2036,10 +2027,7 @@ fn compatible_with_older_cargo() {
20362027
assert_eq!(get_registry_names("src"), ["new-1.0.0"]);
20372028
assert_eq!(
20382029
get_registry_names("cache"),
2039-
// Duplicate crates from two different cache location
2040-
// because we're changing how SourceId is hashed.
2041-
// This change should be reverted once rust-lang/cargo#14917 lands.
2042-
["middle-1.0.0.crate", "new-1.0.0.crate", "new-1.0.0.crate"]
2030+
["middle-1.0.0.crate", "new-1.0.0.crate"]
20432031
);
20442032
}
20452033

0 commit comments

Comments
 (0)