Make offset_of field parsing use metavariable which handles any spacing #119532

GKFX · 2024-01-02T22:49:45Z

As discussed at and around comments #106655 (comment) and #106655 (comment), the current arguments to offset_of do not accept all the whitespace combinations: 0. 1.1.1 and 0.1.1. 1 are currently treated specially in tests/ui/offset-of/offset-of-tuple-nested.rs.

They also do not allow forwarding individual fields as in

macro_rules! off {
    ($a:expr) => {
        offset_of!(m::S, 0. $a)
    }
}

This PR replaces the macro arguments with ($Container:ty, $($fields:expr)+ $(,)?) which does allow any arrangement of whitespace that I could come up with and the forwarding of fields example above.

This also allows for array indexing in the future, which I think is the last future extension to the syntax suggested in the offset_of RFC.

Tracking issue for offset_of: #106655
@rustbot label F-offset_of

@est31

rustbot · 2024-01-02T22:49:53Z

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

est31

Good job! You figured out how to get parse_expr to work. I was a bit scared to use it but I suppose with that, the issues are fixed.

Some very minor nits, otherwise this looks great already.

est31 · 2024-01-03T00:23:33Z

compiler/rustc_parse/src/parser/expr.rs

+            e.emit();
+        }
+
+        // Eat tokens until the macro call ends.


Suggested change

// Eat tokens until the macro call ends.

// Eat tokens until the builtin ends. We already error above for any unrecognized stuff.

I wonder if the check should also do the open delim/close delim matching game, for stuff like builtin # offset_of(Struct, field, ()). But probably not needed, given this is for error recovery.

tests/ui/offset-of/offset-of-builtin.stderr

tests/ui/offset-of/offset-of-builtin.rs

tests/ui/offset-of/offset-of-tuple.rs

est31 · 2024-01-04T00:26:51Z

@bors r+

bors · 2024-01-04T00:26:54Z

📌 Commit f0c0a49 has been approved by est31

It is now in the queue for this repository.

Make offset_of field parsing use metavariable which handles any spacing As discussed at and around comments rust-lang#106655 (comment) and rust-lang#106655 (comment), the current arguments to offset_of do not accept all the whitespace combinations: `0. 1.1.1` and `0.1.1. 1` are currently treated specially in `tests/ui/offset-of/offset-of-tuple-nested.rs`. They also do not allow [forwarding individual fields as in](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=444cdf0ec02b99e8fd5fd8d8ecb312ca) ```rust macro_rules! off { ($a:expr) => { offset_of!(m::S, 0. $a) } } ``` This PR replaces the macro arguments with `($Container:ty, $($fields:expr)+ $(,)?)` which does allow any arrangement of whitespace that I could come up with and the forwarding of fields example above. This also allows for array indexing in the future, which I think is the last future extension to the syntax suggested in the offset_of RFC. Tracking issue for offset_of: rust-lang#106655 `@rustbot` label F-offset_of `@est31`

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#117636 (add test for rust-lang#117626) - rust-lang#118704 (Promote `riscv32{im|imafc}` targets to tier 2) - rust-lang#119184 (Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`) - rust-lang#119325 (custom mir: make it clear what the return block is) - rust-lang#119391 (Use Result::flatten in catch_with_exit_code) - rust-lang#119431 (Support reg_addr register class in s390x inline assembly) - rust-lang#119475 (Remove libtest's dylib) - rust-lang#119532 (Make offset_of field parsing use metavariable which handles any spacing) - rust-lang#119553 (stop feed vis when cant access for trait item) - rust-lang#119556 (Reland optimized-compiler-builtins config) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#117636 (add test for rust-lang#117626) - rust-lang#118704 (Promote `riscv32{im|imafc}` targets to tier 2) - rust-lang#119184 (Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern`) - rust-lang#119325 (custom mir: make it clear what the return block is) - rust-lang#119391 (Use Result::flatten in catch_with_exit_code) - rust-lang#119431 (Support reg_addr register class in s390x inline assembly) - rust-lang#119475 (Remove libtest's dylib) - rust-lang#119532 (Make offset_of field parsing use metavariable which handles any spacing) - rust-lang#119553 (stop feed vis when cant access for trait item) - rust-lang#119574 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119532 - GKFX:offset-of-parse-expr, r=est31 Make offset_of field parsing use metavariable which handles any spacing As discussed at and around comments rust-lang#106655 (comment) and rust-lang#106655 (comment), the current arguments to offset_of do not accept all the whitespace combinations: `0. 1.1.1` and `0.1.1. 1` are currently treated specially in `tests/ui/offset-of/offset-of-tuple-nested.rs`. They also do not allow [forwarding individual fields as in](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=444cdf0ec02b99e8fd5fd8d8ecb312ca) ```rust macro_rules! off { ($a:expr) => { offset_of!(m::S, 0. $a) } } ``` This PR replaces the macro arguments with `($Container:ty, $($fields:expr)+ $(,)?)` which does allow any arrangement of whitespace that I could come up with and the forwarding of fields example above. This also allows for array indexing in the future, which I think is the last future extension to the syntax suggested in the offset_of RFC. Tracking issue for offset_of: rust-lang#106655 ``@rustbot`` label F-offset_of ``@est31``

Make offset_of field parsing use metavariable which handles any spacing

09bb07e

rustbot assigned compiler-errors Jan 2, 2024

This comment has been minimized.

Sign in to view

Update after rebase

f0c0a49

est31 approved these changes Jan 3, 2024

View reviewed changes

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 Jan 4, 2024

matthiaskrgr mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119570

Closed

matthiaskrgr mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119578

Merged

bors merged commit e306cfb into rust-lang:master Jan 4, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 4, 2024

GKFX deleted the offset-of-parse-expr branch January 4, 2024 21:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make offset_of field parsing use metavariable which handles any spacing #119532

Make offset_of field parsing use metavariable which handles any spacing #119532

GKFX commented Jan 2, 2024 •

edited

Loading

rustbot commented Jan 2, 2024

This comment has been minimized.

est31 left a comment

est31 Jan 3, 2024

est31 commented Jan 4, 2024

bors commented Jan 4, 2024

	// Eat tokens until the macro call ends.
	// Eat tokens until the builtin ends. We already error above for any unrecognized stuff.

Make offset_of field parsing use metavariable which handles any spacing #119532

Make offset_of field parsing use metavariable which handles any spacing #119532

Conversation

GKFX commented Jan 2, 2024 • edited Loading

rustbot commented Jan 2, 2024

This comment has been minimized.

est31 left a comment

Choose a reason for hiding this comment

est31 Jan 3, 2024

Choose a reason for hiding this comment

est31 commented Jan 4, 2024

bors commented Jan 4, 2024

GKFX commented Jan 2, 2024 •

edited

Loading