From 26528cfbc8f8f31e3e2f74ba7d8d88b5904c4a31 Mon Sep 17 00:00:00 2001 From: bors Date: Fri, 20 Aug 2021 01:45:15 +0000 Subject: [PATCH 1/3] Auto merge of #9809 - ehuss:bump-curl, r=Eh2406 Bump curl. This updates to the latest version of curl (7.78). 7.77 which is used in rust-lang/rust had an issue where it was failing in Windows 8. I have confirmed that 7.78 works correctly. Fixes #9788 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 09f69d702cd..63e325f0e74 100644 --- 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" From 09eb666a4721b2e2648bc40438dfb2b75ec8e019 Mon Sep 17 00:00:00 2001 From: bors Date: Sun, 15 Aug 2021 05:02:47 +0000 Subject: [PATCH 2/3] Auto merge of #9790 - ehuss:fix-plugin-registrar, r=alexcrichton Fix plugin registrar change. The plugin tests were broken due to a change in https://github.com/rust-lang/rust/pull/85296 which removed the `plugin_registrar` attribute. --- tests/testsuite/cross_compile.rs | 6 +++--- tests/testsuite/plugins.rs | 12 ++++++------ tests/testsuite/proc_macro.rs | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index 827795dab48..32abbad0679 100644 --- 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 index 14592aadf13..e1d9c1da63b 100644 --- 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 index 55e4ca10a2c..12ff56284a8 100644 --- 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 { From ac44893b1965da0d4fe3a6d4467c3a2e4c65228b Mon Sep 17 00:00:00 2001 From: bors Date: Thu, 5 Aug 2021 00:36:09 +0000 Subject: [PATCH 3/3] Auto merge of #9763 - erickt:fix-semver-check, r=ehuss Fix semver check for rust 1.54.0 This updates semver.md to use the new error message for reporting missing generic arguments. --- src/doc/src/reference/semver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/src/reference/semver.md b/src/doc/src/reference/semver.md index 2659012608c..0404efdcfb2 100644 --- a/src/doc/src/reference/semver.md +++ b/src/doc/src/reference/semver.md @@ -943,7 +943,7 @@ pub fn foo() {} use updated_crate::foo; fn main() { - foo::(); // Error: this function takes 2 type arguments but only 1 type argument was supplied + foo::(); // Error: this function takes 2 generic arguments but 1 generic argument was supplied } ```