rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME by lolbinarycat · Pull Request #137834 · rust-lang/rust

lolbinarycat · 2025-03-01T03:19:13Z

rustbot · 2025-03-01T03:19:17Z

rustbot has assigned @BoxyUwU.
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

BoxyUwU · 2025-03-03T18:02:27Z

Seem reasonable, did you verify this fixed the bug locally? if so r=me

lolbinarycat · 2025-03-03T21:27:14Z

I have not, it would be kinda annoying to, so I might as well go all the way and just write a run-make test for this.

rustbot · 2025-03-03T21:30:25Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

tests/run-make/rustc_fluent_macro-hyphen-package/rmake.rs

lolbinarycat · 2025-03-04T06:49:24Z

@BoxyUwU run-make test added, and CI is passing (I don't have bors perms)

BoxyUwU · 2025-03-04T17:37:09Z

@bors r+ rollup

bors · 2025-03-04T17:37:12Z

📌 Commit d1d0b9b has been approved by BoxyUwU

It is now in the queue for this repository.

…7815, r=BoxyUwU rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME fixes rust-lang#137815

…kingjubilee Rollup of 33 pull requests Successful merges: - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136764 (Make `ptr_cast_add_auto_to_object` lint into hard error) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#136975 (Look for `python3` first on MacOS, not `py`) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137502 (Don't include global asm in `mir_keys`, fix error body synthesis) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#137829 (Stabilize [T]::split_off... methods) - rust-lang#137834 (rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME) - rust-lang#137850 (Stabilize `box_uninit_write`) - rust-lang#137912 (Do not recover missing lifetime with random in-scope lifetime) - rust-lang#137913 (Allow struct field default values to reference struct's generics) - rust-lang#137923 (Simplify `<Postorder as Iterator>::size_hint`) - rust-lang#137949 (Update MSVC INSTALL.md instructions to recommend VS 2022 + recent Windows 10/11 SDK) - rust-lang#137963 (Add ``dyn`` keyword to `E0373` examples) - rust-lang#137975 (Remove unused `PpMode::needs_hir`) - rust-lang#137986 (Fix some typos) - rust-lang#137991 (Add `avr-none` to SUMMARY.md and platform-support.md) - rust-lang#137993 (Remove obsolete comment from DeduceReadOnly) - rust-lang#137996 (Revert "compiler/rustc_data_structures/src/sync/worker_local.rs: delete "unsafe impl Sync"") r? `@ghost` `@rustbot` modify labels: rollup

tgross35 · 2025-03-05T02:52:36Z

@bors r-, the tests failed in #138020 (comment)

workingjubilee · 2025-03-05T03:36:07Z

@bors r-

lolbinarycat · 2025-03-05T05:42:10Z

well that seems incorrect, run-make tests should have access to a full sysroot, and it got past initial CI...

tgross35 · 2025-03-05T05:47:19Z

The test might need to be restricted to only targets with std, the failure was testing wasm.

lolbinarycat · 2025-03-05T05:50:20Z

ah, right, of course, CI tests less platforms.

i'll just add a cfg.

tgross35 · 2025-03-05T06:06:18Z

It would be preferable to use a //@ directive so we don't even spend the time building an empty test. But surprisingly I'm not seeing something like needs-std or ignore-no-std, @jieyouxu what's the best practice here?

jieyouxu · 2025-03-05T06:15:58Z

Oh I didn't look at this too closely. Instead of run-make, can this test be ui-fulldeps?

Otherwise you need to carefully match up the rustc invoked by the underlying cargo's sysroot to usr rustc_private, and frankly I don't think it's worth the effort. (For this I wod even say Works Locally is good enough.)

lolbinarycat · 2025-03-05T17:26:26Z

@jieyouxu as far as i can tell, ui-fulldeps tests are built directly with rustc, and we specifically need the environment variables that cargo sets.

will run-make cargo actually default to the global sysroot, and not the one built by bootstrap? if so, that seems like a major hazard, since plenty of other run-make tests use cargo, and some even use rustc_private.

is passing CI good enough for "works locally"? if so i could just rip out the test now that we know it works.

BoxyUwU · 2025-03-05T18:09:34Z

I think its fine to r+ this if you just remove the test since we know it works.

jieyouxu · 2025-03-05T18:16:23Z

@jieyouxu as far as i can tell, ui-fulldeps tests are built directly with rustc, and we specifically need the environment variables that cargo sets.

Right.

will run-make cargo actually default to the global sysroot, and not the one built by bootstrap? if so, that seems like a major hazard, since plenty of other run-make tests use cargo, and some even use rustc_private.

It depends. On --stage=1 or higher, the cargo() from run_make_support will use the rustc from the corresponding staged sysroot. But on --stage=0, it can depend on what initial rustc/cargo you specify.

IOW, the cargo() from run_make_support is used to ensure something can be built. You should not use it to try to build something that depends on artifacts from the bootstrap-built sysroots. The ones that use cargo() typically uses -Zbuild-std=core or otherwise do not depend on bootstrap-built compiler artifacts.

I.e. you use it as a wrapper to test the underlying rustc's behavior but you cannot depend on the rustc-under-test's libraries.

is passing CI good enough for "works locally"? if so i could just rip out the test now that we know it works.

Yes. I think for the purposes of the changes here, building at all is good enough.

lolbinarycat · 2025-03-06T02:58:09Z

@BoxyUwU test un-pushed.

BoxyUwU · 2025-03-06T06:30:11Z

@bors r+ rollup

bors · 2025-03-06T06:30:14Z

📌 Commit 38b364b has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2025-03-06T06:30:14Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

…7815, r=BoxyUwU rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME fixes rust-lang#137815

…mpiler-errors Rollup of 25 pull requests Successful merges: - rust-lang#135733 (Implement `&pin const self` and `&pin mut self` sugars) - rust-lang#135895 (Document workings of successors more clearly) - rust-lang#136922 (Pattern types: Avoid having to handle an Option for range ends in the type system or the HIR) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137744 (Re-add `Clone`-derive on `Thir`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137802 (miri native-call support: all previously exposed provenance is accessible to the callee) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#137834 (rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME) - rust-lang#137868 (Add minimal platform support documentation for powerpc-unknown-linux-gnuspe) - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT) - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty) - rust-lang#138038 (Update `compiler-builtins` to 0.1.151) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137834 - lolbinarycat:rustc_fluent_macro-137815, r=BoxyUwU rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME fixes rust-lang#137815

…mpiler-errors Rollup of 25 pull requests Successful merges: - rust-lang#135733 (Implement `&pin const self` and `&pin mut self` sugars) - rust-lang#135895 (Document workings of successors more clearly) - rust-lang#136922 (Pattern types: Avoid having to handle an Option for range ends in the type system or the HIR) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137744 (Re-add `Clone`-derive on `Thir`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137802 (miri native-call support: all previously exposed provenance is accessible to the callee) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#137834 (rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME) - rust-lang#137868 (Add minimal platform support documentation for powerpc-unknown-linux-gnuspe) - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT) - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty) - rust-lang#138038 (Update `compiler-builtins` to 0.1.151) r? `@ghost` `@rustbot` modify labels: rollup

Summary: I need this for buckifying the next version of rustc after [rust-lang/rust#137834](rust-lang/rust#137834) *"rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME"* For a Cargo package like this: ``` [package] name = "foo-bar" [lib] name = "baz-quux" ``` the CARGO_PKG_NAME is "foo-bar" (with hyphen) and the CARGO_CRATE_NAME is "baz_quux" (with underscore). https://www.internalfb.com/code/fbsource/[b006779c8e495cf1b16de10324d20a1e61259cb9]/fbcode/common/rust/tools/reindeer/src/fixups.rs?lines=875-877%2C922 Reviewed By: diliop Differential Revision: D73134016 fbshipit-source-id: 494b48d16ab0c3d18132c0a2d190962393453b38

rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME

38b364b

fixes rust-lang#137815

rustbot assigned BoxyUwU Mar 1, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 1, 2025

BoxyUwU added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 3, 2025

rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Mar 3, 2025

jieyouxu reviewed Mar 3, 2025

View reviewed changes

tests/run-make/rustc_fluent_macro-hyphen-package/rmake.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

lolbinarycat force-pushed the rustc_fluent_macro-137815 branch 5 times, most recently from 429394f to d1d0b9b Compare March 4, 2025 04:51

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 4, 2025

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 4, 2025

Rollup merge of rust-lang#137834 - lolbinarycat:rustc_fluent_macro-13…

96ed4ec

…7815, r=BoxyUwU rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME fixes rust-lang#137815

workingjubilee mentioned this pull request Mar 4, 2025

Rollup of 33 pull requests #138020

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2025

lolbinarycat force-pushed the rustc_fluent_macro-137815 branch from 23a7798 to 38b364b Compare March 5, 2025 23:31

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2025

Noratrieb added a commit to Noratrieb/rust that referenced this pull request Mar 6, 2025

Rollup merge of rust-lang#137834 - lolbinarycat:rustc_fluent_macro-13…

66cc399

…7815, r=BoxyUwU rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME fixes rust-lang#137815

Noratrieb mentioned this pull request Mar 6, 2025

Rollup of 42 pull requests #138086

Closed

compiler-errors mentioned this pull request Mar 6, 2025

Rollup of 25 pull requests #138114

Merged

bors merged commit 56f0a60 into rust-lang:master Mar 7, 2025
12 checks passed

rustbot added this to the 1.87.0 milestone Mar 7, 2025

dtolnay mentioned this pull request Aug 19, 2025

Update to Rust 1.87.0 dtolnay/buck2-rustc-bootstrap#10

Merged

Uh oh!

Conversation

lolbinarycat commented Mar 1, 2025

Uh oh!

rustbot commented Mar 1, 2025

Uh oh!

BoxyUwU commented Mar 3, 2025

Uh oh!

lolbinarycat commented Mar 3, 2025

Uh oh!

rustbot commented Mar 3, 2025

Uh oh!

Uh oh!

This comment has been minimized.

lolbinarycat commented Mar 4, 2025

Uh oh!

BoxyUwU commented Mar 4, 2025

Uh oh!

bors commented Mar 4, 2025

Uh oh!

tgross35 commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

lolbinarycat commented Mar 5, 2025

Uh oh!

tgross35 commented Mar 5, 2025

Uh oh!

lolbinarycat commented Mar 5, 2025

Uh oh!

tgross35 commented Mar 5, 2025

Uh oh!

jieyouxu commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lolbinarycat commented Mar 5, 2025

Uh oh!

BoxyUwU commented Mar 5, 2025

Uh oh!

jieyouxu commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lolbinarycat commented Mar 6, 2025

Uh oh!

BoxyUwU commented Mar 6, 2025

Uh oh!

bors commented Mar 6, 2025

Uh oh!

bors commented Mar 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

jieyouxu commented Mar 5, 2025 •

edited

Loading

jieyouxu commented Mar 5, 2025 •

edited

Loading