-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Add more build-info functions to c-api #8216
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
Open
bschoenmaeckers
wants to merge
1
commit into
RustPython:main
Choose a base branch
from
bschoenmaeckers:c-api-buildinfo
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+40
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4,6 +4,7 @@ use crate::{Py, PyPayload, PyResult, VirtualMachine, builtins::PyModule, convert | |||||
|
|
||||||
| #[cfg(all(not(feature = "host_env"), feature = "stdio"))] | ||||||
| pub(crate) use sys::SandboxStdio; | ||||||
| pub use sys::{BUILD_INFO, COMPILER, COPYRIGHT, PLATFORM, VERSION}; | ||||||
| pub(crate) use sys::{DOC, MAXSIZE, RUST_MULTIARCH, UnraisableHookArgsData, module_def, multiarch}; | ||||||
|
|
||||||
| #[pymodule(name = "_jit")] | ||||||
|
|
@@ -222,7 +223,7 @@ pub mod sys { | |||||
| #[pyattr(name = "api_version")] | ||||||
| const API_VERSION: u32 = 0x0; // what C api? | ||||||
| #[pyattr(name = "copyright")] | ||||||
| const COPYRIGHT: &str = "Copyright (c) 2019 RustPython Team"; | ||||||
| pub const COPYRIGHT: &str = "Copyright (c) 2019 RustPython Team"; | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hmm, another suggestion.
Suggested change
Then add a IntoPyObject conversion from &CStr to String to ignore the tail null char. |
||||||
| #[pyattr(name = "float_repr_style")] | ||||||
| const FLOAT_REPR_STYLE: &str = "short"; | ||||||
| #[pyattr(name = "_framework")] | ||||||
|
|
@@ -708,7 +709,11 @@ pub mod sys { | |||||
| } | ||||||
|
|
||||||
| #[pyattr(name = "version")] | ||||||
| const VERSION: &str = version::RUSTPYTHON_VERSION; | ||||||
| pub const VERSION: &str = version::RUSTPYTHON_VERSION; | ||||||
|
|
||||||
| pub const BUILD_INFO: &str = version::RUSTPYTHON_BUILD_INFO; | ||||||
|
|
||||||
| pub const COMPILER: &str = "[Rust]"; | ||||||
|
|
||||||
| // Note: This is Python DLL version in CPython, but we arbitrary fill it for compatibility | ||||||
| #[cfg(windows)] | ||||||
|
|
||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win
Deduplicate the four near-identical build-metadata functions with a macro.
Py_GetBuildInfo,Py_GetCompiler,Py_GetCopyright, andPy_GetPlatformdiffer only in the source constant, static name, and panic message — everything else is copy-pasted.♻️ Proposed macro-based refactor
As per coding guidelines: "When branches differ only in a value but share common logic, extract the differing value first, then call the common logic once to avoid duplicate code."
🤖 Prompt for AI Agents
Source: Coding guidelines