Skip to content
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.

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

Upgrade project to edition 2018 #389

Merged
merged 5 commits into from
May 3, 2021
Merged

Upgrade project to edition 2018 #389

merged 5 commits into from
May 3, 2021

Conversation

weihanglo
Copy link
Contributor

Just update to edition 2018 before edition 2021 coming.

curl-sys/lib.rs Outdated
Comment on lines 4 to 14
extern crate libc;
// These `extern crate` are required for conditional linkages of curl.
#[cfg(link_libnghttp2)]
extern crate libnghttp2_sys;
#[cfg(link_libz)]
extern crate libz_sys;
#[cfg(feature = "mesalink")]
extern crate mesalink; // ensure lib is linked to
#[cfg(link_openssl)]
extern crate openssl_sys;
#[cfg(windows)]
extern crate winapi;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we preserve extern crate for openssl_sys, libnghttp2_sys and libz_sys for the sake of conditional linkage.

@weihanglo
Copy link
Contributor Author

Really weird. It seems that all CI tests has passed. https://github.com/alexcrichton/curl-rust/actions/runs/805297756

#[cfg(link_libnghttp2)]
extern crate libnghttp2_sys;
#[cfg(link_libz)]
extern crate libz_sys;
#[cfg(feature = "mesalink")]
extern crate mesalink; // ensure lib is linked to
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to remain for the linkage too?

Copy link
Contributor Author

@weihanglo weihanglo May 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not? I thought it would be linked automatically when feature "mesalink" is on. Anyway, updated at 5768b0b.

@alexcrichton
Copy link
Owner

Thanks for this!

@alexcrichton alexcrichton merged commit f41ace0 into alexcrichton:master May 3, 2021
@weihanglo weihanglo deleted the edition2018 branch May 3, 2021 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants