Add `*_value` methods to proc_macro lib #136355

GuillaumeGomez · 2025-01-31T15:03:00Z

This is the implementation of rust-lang/libs-team#459.

It allows to get the actual value (unescaped) of the different string literals.

Part of #136652.

r? libs-api

GuillaumeGomez · 2025-01-31T15:19:00Z

I opened a thread on zulip on how to correctly integrate this new lib into bootstrap build process.

src/literal-escaper/Cargo.toml

library/proc_macro/Cargo.toml

src/literal-escaper/README.md

GuillaumeGomez · 2025-02-01T00:24:15Z

I don't see how to fix this failure. I'll wait for someone from @rust-lang/bootstrap to take a look.

Apart from this, seems the PR is mostly ready. :)

onur-ozkan

just a tiny suggestion, LGTM otherwise

src/bootstrap/src/core/metadata.rs

onur-ozkan · 2025-02-01T06:30:45Z

just a tiny suggestion, LGTM otherwise

Oh, tests are failing on bootstrap (due to "literal-escaper" if check)..

rustbot · 2025-02-04T10:04:22Z

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

GuillaumeGomez · 2025-02-04T10:04:59Z

PR is now ready for review!

bors · 2025-02-06T18:06:39Z

☔ The latest upstream changes (presumably #136585) made this pull request unmergeable. Please resolve the merge conflicts.

GuillaumeGomez · 2025-02-06T18:58:58Z

Fixed merge conflicts.

GuillaumeGomez · 2025-03-17T09:46:26Z

@bors r=Amanieu

bors · 2025-03-17T09:46:29Z

📌 Commit 4394f94 has been approved by Amanieu

It is now in the queue for this repository.

Rollup of 9 pull requests Successful merges: - rust-lang#136355 (Add `*_value` methods to proc_macro lib) - rust-lang#137621 (Add std support to cygwin target) - rust-lang#137793 (Stablize anonymous pipe) - rust-lang#138341 (std: Mention clone-on-write mutation in Arc<T>) - rust-lang#138517 (Improve upvar analysis for deref of child capture) - rust-lang#138584 (Update Rust Foundation links in Readme) - rust-lang#138586 (Document `#![register_tool]`) - rust-lang#138590 (Flatten and simplify some control flow 🫓) - rust-lang#138592 (update change entry for rust-lang#137147) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#136355 - GuillaumeGomez:proc-macro_add_value_retrieval_methods, r=Amanieu Add `*_value` methods to proc_macro lib This is the implementation of rust-lang/libs-team#459. It allows to get the actual value (unescaped) of the different string literals. Part of rust-lang#136652. r? libs-api

bors · 2025-03-18T03:50:59Z

⌛ Testing commit 4394f94 with merge 493c38b...

bors · 2025-03-18T05:08:24Z

💔 Test failed - checks-actions

jhpratt · 2025-03-18T05:09:35Z

@bors r-

already merged, bors!

RalfJung · 2025-03-18T07:19:19Z

I think this PR broke the rustc-src package:

$ cargo metadata --format-version 1 --manifest-path /home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/compiler/rustc/Cargo.toml
    Updating crates.io index
error: failed to get `literal-escaper` as a dependency of package `rustc_ast v0.0.0 (/home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/compiler/rustc_ast)`
    ... which satisfies path dependency `rustc_ast` of package `rustc_codegen_ssa v0.0.0 (/home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/compiler/rustc_codegen_ssa)`
    ... which satisfies path dependency `rustc_codegen_ssa` of package `rustc-main v0.0.0 (/home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/compiler/rustc)`

Caused by:
  failed to load source for dependency `literal-escaper`

Caused by:
  Unable to update /home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/library/literal-escaper

Caused by:
  failed to read `/home/runner/.rustup/toolchains/miri/lib/rustlib/rustc-src/rust/library/literal-escaper/Cargo.toml`

RalfJung · 2025-03-18T07:39:21Z

I made an issue for this: #138647

…add_value_retrieval_methods, r=Amanieu" This reverts commit 08dfbf4, reversing changes made to 10bcdad.

…r=petrochenkov Revert: Add *_value methods to proc_macro lib This reverts rust-lang#136355. That PR caused unexpected breakage: - the rustc-dev component can no longer be loaded by cargo, which impacts Miri and clippy and likely others - rustc_lexer can no longer be published to crates.io, which impacts RA See rust-lang#138647 for context. Cc `@GuillaumeGomez` `@Amanieu`

…, r=petrochenkov Revert: Add *_value methods to proc_macro lib This reverts rust-lang#136355. That PR caused unexpected breakage: - the rustc-dev component can no longer be loaded by cargo, which impacts Miri and clippy and likely others - rustc_lexer can no longer be published to crates.io, which impacts RA See rust-lang#138647 for context. Cc `@GuillaumeGomez` `@Amanieu`

Rollup merge of rust-lang#138661 - RalfJung:revert-rustc-dev-breakage, r=petrochenkov Revert: Add *_value methods to proc_macro lib This reverts rust-lang#136355. That PR caused unexpected breakage: - the rustc-dev component can no longer be loaded by cargo, which impacts Miri and clippy and likely others - rustc_lexer can no longer be published to crates.io, which impacts RA See rust-lang#138647 for context. Cc `@GuillaumeGomez` `@Amanieu`

rustbot assigned joshtriplett Jan 31, 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 Jan 31, 2025

This comment has been minimized.

Sign in to view

bjorn3 reviewed Jan 31, 2025

View reviewed changes

src/literal-escaper/Cargo.toml Outdated Show resolved Hide resolved

cuviper reviewed Jan 31, 2025

View reviewed changes

library/proc_macro/Cargo.toml Outdated Show resolved Hide resolved

klensy reviewed Jan 31, 2025

View reviewed changes

src/literal-escaper/README.md Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from f9e8cc5 to 5c5ed38 Compare January 31, 2025 21:14

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from 5c5ed38 to 27ab932 Compare January 31, 2025 22:13

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jan 31, 2025

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from f86a30d to 75aeabf Compare January 31, 2025 22:54

This comment has been minimized.

Sign in to view

rustbot added the A-tidy Area: The tidy tool label Jan 31, 2025

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from cf52b9f to e71c43b Compare January 31, 2025 23:33

This comment has been minimized.

Sign in to view

onur-ozkan approved these changes Feb 1, 2025

View reviewed changes

src/bootstrap/src/core/metadata.rs Show resolved Hide resolved

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from e71c43b to 774a25c Compare February 3, 2025 22:10

GuillaumeGomez marked this pull request as ready for review February 4, 2025 10:04

GuillaumeGomez force-pushed the proc-macro_add_value_retrieval_methods branch from 774a25c to 1d10d7b Compare February 6, 2025 18:33

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 17, 2025

Only add rustc_randomized_layouts if the crate has it

4394f94

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 17, 2025

jhpratt mentioned this pull request Mar 17, 2025

Rollup of 9 pull requests #138595

Merged

bors merged commit 08dfbf4 into rust-lang:master Mar 17, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 17, 2025

GuillaumeGomez deleted the proc-macro_add_value_retrieval_methods branch March 17, 2025 14:07

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2025

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2025

Kobzol mentioned this pull request Mar 18, 2025

test rustc-dev dist component on CI #138646

Open

RalfJung mentioned this pull request Mar 18, 2025

rustc-dev component is broken by missing literal-escaper #138647

Open

RalfJung added a commit to RalfJung/rust that referenced this pull request Mar 18, 2025

Revert "Rollup merge of rust-lang#136355 - GuillaumeGomez:proc-macro_…

20d04d8

…add_value_retrieval_methods, r=Amanieu" This reverts commit 08dfbf4, reversing changes made to 10bcdad.

RalfJung mentioned this pull request Mar 18, 2025

Revert: Add *_value methods to proc_macro lib #138661

Merged

ehuss mentioned this pull request Mar 18, 2025

test(build-std): address overly-matched snapshot rust-lang/cargo#15325

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `*_value` methods to proc_macro lib #136355

Add `*_value` methods to proc_macro lib #136355

GuillaumeGomez commented Jan 31, 2025 •

edited

Loading

This comment has been minimized.

GuillaumeGomez commented Jan 31, 2025

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Feb 1, 2025

onur-ozkan left a comment

onur-ozkan commented Feb 1, 2025 •

edited

Loading

rustbot commented Feb 4, 2025

GuillaumeGomez commented Feb 4, 2025

bors commented Feb 6, 2025

GuillaumeGomez commented Feb 6, 2025

GuillaumeGomez commented Mar 17, 2025

bors commented Mar 17, 2025

bors commented Mar 18, 2025

bors commented Mar 18, 2025

jhpratt commented Mar 18, 2025

RalfJung commented Mar 18, 2025

RalfJung commented Mar 18, 2025

Add *_value methods to proc_macro lib #136355

Add *_value methods to proc_macro lib #136355

Conversation

GuillaumeGomez commented Jan 31, 2025 • edited Loading

This comment has been minimized.

GuillaumeGomez commented Jan 31, 2025

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Feb 1, 2025

onur-ozkan left a comment

Choose a reason for hiding this comment

onur-ozkan commented Feb 1, 2025 • edited Loading

rustbot commented Feb 4, 2025

GuillaumeGomez commented Feb 4, 2025

bors commented Feb 6, 2025

GuillaumeGomez commented Feb 6, 2025

GuillaumeGomez commented Mar 17, 2025

bors commented Mar 17, 2025

bors commented Mar 18, 2025

bors commented Mar 18, 2025

jhpratt commented Mar 18, 2025

RalfJung commented Mar 18, 2025

RalfJung commented Mar 18, 2025

Add `*_value` methods to proc_macro lib #136355

Add `*_value` methods to proc_macro lib #136355

GuillaumeGomez commented Jan 31, 2025 •

edited

Loading

onur-ozkan commented Feb 1, 2025 •

edited

Loading