Don't link legacy_stdio_definitions from std
#3226
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
std on Windows does not use `printf` or `fprintf` so never needs the `legacy_stdio_definitions.lib` import library.
ChrisDenton
force-pushed
the
std-no-legacy
branch
from
405c98b
to
34866c1
Compare
JohnTitor
approved these changes
Apr 26, 2023
|
@bors r+ |
Urgau
reviewed
Apr 26, 2023
Comment on lines
+281
to
+291
| cfg_if! { | ||
| if #[cfg(not(feature = "rustc-dep-of-std"))] { | ||
| #[cfg_attr( | ||
| all(windows, target_env = "msvc"), | ||
| link(name = "legacy_stdio_definitions") | ||
| )] | ||
| extern "C" { | ||
| pub fn printf(format: *const c_char, ...) -> ::c_int; | ||
| pub fn fprintf(stream: *mut FILE, format: *const c_char, ...) -> ::c_int; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| cfg_if! { | |
| if #[cfg(not(feature = "rustc-dep-of-std"))] { | |
| #[cfg_attr( | |
| all(windows, target_env = "msvc"), | |
| link(name = "legacy_stdio_definitions") | |
| )] | |
| extern "C" { | |
| pub fn printf(format: *const c_char, ...) -> ::c_int; | |
| pub fn fprintf(stream: *mut FILE, format: *const c_char, ...) -> ::c_int; | |
| } | |
| } | |
| #[cfg(not(feature = "rustc-dep-of-std"))] | |
| #[cfg_attr( | |
| all(windows, target_env = "msvc"), | |
| link(name = "legacy_stdio_definitions") | |
| )] | |
| extern "C" { | |
| pub fn printf(format: *const c_char, ...) -> ::c_int; | |
| pub fn fprintf(stream: *mut FILE, format: *const c_char, ...) -> ::c_int; | |
| } |
nit: no need to use cfg_if! here
There was a problem hiding this comment.
That was what I originally did. but the style checker complained.
|
☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14 |
|
Which version will update? Now, I using "rustc 1.69.0 (84c898d65 2023-04-16)". Is it the latest version? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
std on windows-msvc does not use
printforfprintfso never needs thelegacy_stdio_definitions.libimport library and will always work fine without it.