Skip to content

Cleanup for rustc-link-arg-cdylib #15326

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

Merged
merged 3 commits into from
Mar 19, 2025
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 18, 2025

This does a little bit of cleanup around rustc-link-arg-cdylib build script instruction:

  • Reorders the documentation so that it is consistent.
  • Updates the documentation to mention both the new (rustc-link-arg-cdylib) and old (rustc-cdylib-link-arg) forms are documented, with the new form as the primary form.
  • Adds a test for the old form, since we didn't have any.

Somehow I missed all this in #8441 and #9557.

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2025

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2025
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks!

@epage
Copy link
Contributor

epage commented Mar 18, 2025

Do we need to make any changes to build-rs api?

@ehuss
Copy link
Contributor Author

ehuss commented Mar 18, 2025

Do we need to make any changes to build-rs api?

If you mean maybe rename rustc_cdylib_link_arg to rustc_link_arg_cdylib, I don't have much of an opinion there. Maybe?

ehuss added 3 commits March 18, 2025 16:28
This reorders these sections so they are presented in a logical order,
and matches the summary at the top.
This form has the consistent pattern of `rustc-link-arg-$KIND`.
The old, original `rustc-cdylib-link-arg` is just an alias.
We didn't have any tests that included the old `rustc-cdylib-link-arg`
form.
@ehuss ehuss force-pushed the link-arg-cleanup branch from 26a4d9d to 5516ffa Compare March 18, 2025 23:28
@weihanglo weihanglo added this pull request to the merge queue Mar 19, 2025
Merged via the queue into rust-lang:master with commit 662213b Mar 19, 2025
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2025
Update cargo

14 commits in 6cf8267012570f63d6b86e85a2ae5627de52df9e..307cbfda3119f06600e43cd38283f4a746fe1f8b
2025-03-14 15:25:36 +0000 to 2025-03-20 20:00:39 +0000
- feat: Add custom completer for cargo <TAB> to complete aliases defined in config.toml (rust-lang/cargo#15319)
- fix(build-dir): Renamed workspace-manifest-path-hash to workspace-path-hash (rust-lang/cargo#15334)
- feat: vcs, color, and message format native completion (rust-lang/cargo#15322)
- Fix `[env]` `relative` description in reference (rust-lang/cargo#15332)
- chore: fix some typos (rust-lang/cargo#15329)
- Cleanup for rustc-link-arg-cdylib (rust-lang/cargo#15326)
- fix(toml): Report '<target>.edition' deprecation to users (rust-lang/cargo#15321)
- test(build-std): address overly-matched snapshot (rust-lang/cargo#15325)
- Added `build.build_dir` templating support (rust-lang/cargo#15236)
- docs: make it clearer that `rust_version` is enforced during compile (rust-lang/cargo#15303)
- feat: Add custom completer for cargo +<TAB> to complete toolchain name (rust-lang/cargo#15301)
- chore: fix some typos (rust-lang/cargo#15316)
- fix: deduplicate crate types in cargo rustc command (rust-lang/cargo#15314)
- docs: mention wrong URLs as a cause of git authentication errors (rust-lang/cargo#15304)

r? ghost
@rustbot rustbot added this to the 1.87.0 milestone Mar 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants