Skip to content

[beta] Bump curl #9810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 20, 2021
Merged

[beta] Bump curl #9810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26528cf
Auto merge of #9809 - ehuss:bump-curl, r=Eh2406
bors Aug 20, 2021
09eb666
Auto merge of #9790 - ehuss:fix-plugin-registrar, r=alexcrichton
bors Aug 15, 2021
ac44893
Auto merge of #9763 - erickt:fix-semver-check, r=ehuss
bors Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/semver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
```

Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/cross_compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
"#,
Expand Down
12 changes: 6 additions & 6 deletions tests/testsuite/plugins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
"#,
Expand Down Expand Up @@ -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;
Expand All @@ -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() }
}
"#,
Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/proc_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down