Auto merge of #13004 - weihanglo:rust-1.74.0-bump-credential, r=ehuss

[stable-1.74] chore: bump `cargo-credential-*` crates as e58b84d broke stuff
rust-lang · Nov 20, 2023 · 5c8a284 · 5c8a284
2 parents ecb9851 + 9f68d56
commit 5c8a284
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 568 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -98,7 +98,7 @@ jobs:
       - name: Install cargo-semver-checks
         run: |
           mkdir installed-bins
-          curl -Lf https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.22.1/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz \
+          curl -Lf https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.24.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz \
             | tar -xz --directory=./installed-bins
           echo `pwd`/installed-bins >> $GITHUB_PATH
       - run: ci/validate-version-bump.sh

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,9 +23,9 @@ base64 = "0.21.3"
 bytesize = "1.3"
 cargo = { path = "" }
 cargo-credential = { version = "0.4.0", path = "credential/cargo-credential" }
-cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
-cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
-cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
+cargo-credential-libsecret = { version = "0.4.0", path = "credential/cargo-credential-libsecret" }
+cargo-credential-wincred = { version = "0.4.0", path = "credential/cargo-credential-wincred" }
+cargo-credential-macos-keychain = { version = "0.4.0", path = "credential/cargo-credential-macos-keychain" }
 cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" }
 cargo-test-macro = { path = "crates/cargo-test-macro" }
 cargo-test-support = { path = "crates/cargo-test-support" }

diff --git a/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-libsecret"
-version = "0.3.2"
+version = "0.4.0"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/rust-lang/cargo"

diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-macos-keychain"
-version = "0.3.1"
+version = "0.4.0"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/rust-lang/cargo"

diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-wincred"
-version = "0.3.1"
+version = "0.4.0"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/rust-lang/cargo"

diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs
@@ -10,10 +10,6 @@ use std::collections::HashMap;
 use std::num::NonZeroU64;
 use tracing::debug;
 
-pub use super::encode::Metadata;
-pub use super::encode::{EncodableDependency, EncodablePackageId, EncodableResolve};
-pub use super::resolve::Resolve;
-
 // A `Context` is basically a bunch of local resolution information which is
 // kept around for all `BacktrackFrame` instances. As a result, this runs the
 // risk of being cloned *a lot* so we want to make this as cheap to clone as

diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs
@@ -411,92 +411,6 @@ fn linker() {
         .run();
 }
 
-#[cargo_test(nightly, reason = "plugins are unstable")]
-fn plugin_with_extra_dylib_dep() {
-    if cross_compile::disabled() {
-        return;
-    }
-
-    let foo = project()
-        .file(
-            "Cargo.toml",
-            r#"
-                [package]
-                name = "foo"
-                version = "0.0.1"
-                authors = []
-
-                [dependencies.bar]
-                path = "../bar"
-            "#,
-        )
-        .file(
-            "src/main.rs",
-            r#"
-                #![feature(plugin)]
-                #![plugin(bar)]
-
-                fn main() {}
-            "#,
-        )
-        .build();
-    let _bar = project()
-        .at("bar")
-        .file(
-            "Cargo.toml",
-            r#"
-                [package]
-                name = "bar"
-                version = "0.0.1"
-                authors = []
-
-                [lib]
-                name = "bar"
-                plugin = true
-
-                [dependencies.baz]
-                path = "../baz"
-            "#,
-        )
-        .file(
-            "src/lib.rs",
-            r#"
-                #![feature(rustc_private)]
-
-                extern crate baz;
-                extern crate rustc_driver;
-
-                use rustc_driver::plugin::Registry;
-
-                #[no_mangle]
-                pub fn __rustc_plugin_registrar(reg: &mut Registry) {
-                    println!("{}", baz::baz());
-                }
-            "#,
-        )
-        .build();
-    let _baz = project()
-        .at("baz")
-        .file(
-            "Cargo.toml",
-            r#"
-                [package]
-                name = "baz"
-                version = "0.0.1"
-                authors = []
-
-                [lib]
-                name = "baz"
-                crate_type = ["dylib"]
-            "#,
-        )
-        .file("src/lib.rs", "pub fn baz() -> i32 { 1 }")
-        .build();
-
-    let target = cross_compile::alternate();
-    foo.cargo("build --target").arg(&target).run();
-}
-
 #[cargo_test]
 fn cross_tests() {
     if !cross_compile::can_run_on_host() {

diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs
@@ -131,7 +131,6 @@ mod patch;
 mod path;
 mod paths;
 mod pkgid;
-mod plugins;
 mod proc_macro;
 mod profile_config;
 mod profile_custom;