Auto merge of #9810 - ehuss:beta-bump-curl, r=alexcrichton

[beta] Bump curl Beta backport of #9809 to fix #9788 Also backport to appease CI: * #9790 — Fix plugin registrar change. * #9763 — Fix semver check for rust 1.54.0
rust-lang · Aug 20, 2021 · ecec075 · ecec075
2 parents 1f76a21 + ac44893
commit ecec075
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,8 +25,8 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" }
 cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
 crates-io = { path = "crates/crates-io", version = "0.33.0" }
 crossbeam-utils = "0.8"
-curl = { version = "0.4.23", features = ["http2"] }
-curl-sys = "0.4.22"
+curl = { version = "0.4.38", features = ["http2"] }
+curl-sys = "0.4.45"
 env_logger = "0.9.0"
 pretty_env_logger = { version = "0.4", optional = true }
 anyhow = "1.0"

diff --git a/src/doc/src/reference/semver.md b/src/doc/src/reference/semver.md
@@ -943,7 +943,7 @@ pub fn foo<T, U>() {}
 use updated_crate::foo;
 
 fn main() {
-    foo::<u8>(); // Error: this function takes 2 type arguments but only 1 type argument was supplied
+    foo::<u8>(); // Error: this function takes 2 generic arguments but 1 generic argument was supplied
 }
 ```
 

diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs
@@ -463,15 +463,15 @@ fn plugin_with_extra_dylib_dep() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(plugin_registrar, rustc_private)]
+                #![feature(rustc_private)]
 
                 extern crate baz;
                 extern crate rustc_driver;
 
                 use rustc_driver::plugin::Registry;
 
-                #[plugin_registrar]
-                pub fn foo(reg: &mut Registry) {
+                #[no_mangle]
+                pub fn __rustc_plugin_registrar(reg: &mut Registry) {
                     println!("{}", baz::baz());
                 }
             "#,

diff --git a/tests/testsuite/plugins.rs b/tests/testsuite/plugins.rs
@@ -67,15 +67,15 @@ fn plugin_to_the_max() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(plugin_registrar, rustc_private)]
+                #![feature(rustc_private)]
 
                 extern crate baz;
                 extern crate rustc_driver;
 
                 use rustc_driver::plugin::Registry;
 
-                #[plugin_registrar]
-                pub fn foo(_reg: &mut Registry) {
+                #[no_mangle]
+                pub fn __rustc_plugin_registrar(_reg: &mut Registry) {
                     println!("{}", baz::baz());
                 }
             "#,
@@ -191,7 +191,7 @@ fn plugin_with_dynamic_native_dependency() {
         .file(
             "bar/src/lib.rs",
             r#"
-                #![feature(plugin_registrar, rustc_private)]
+                #![feature(rustc_private)]
 
                 extern crate rustc_driver;
                 use rustc_driver::plugin::Registry;
@@ -200,8 +200,8 @@ fn plugin_with_dynamic_native_dependency() {
                 #[cfg_attr(target_env = "msvc", link(name = "builder.dll"))]
                 extern { fn foo(); }
 
-                #[plugin_registrar]
-                pub fn bar(_reg: &mut Registry) {
+                #[no_mangle]
+                pub fn __rustc_plugin_registrar(_reg: &mut Registry) {
                     unsafe { foo() }
                 }
             "#,

diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs
@@ -227,7 +227,7 @@ fn plugin_and_proc_macro() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(plugin_registrar, rustc_private)]
+                #![feature(rustc_private)]
                 #![feature(proc_macro, proc_macro_lib)]
 
                 extern crate rustc_driver;
@@ -236,8 +236,8 @@ fn plugin_and_proc_macro() {
                 extern crate proc_macro;
                 use proc_macro::TokenStream;
 
-                #[plugin_registrar]
-                pub fn plugin_registrar(reg: &mut Registry) {}
+                #[no_mangle]
+                pub fn __rustc_plugin_registrar(reg: &mut Registry) {}
 
                 #[proc_macro_derive(Questionable)]
                 pub fn questionable(input: TokenStream) -> TokenStream {