Add PartialEq<char> for proc_macro::Punct #78636

dtolnay · 2020-11-01T17:51:02Z

punct.as_char() == '░' is pervasive when parsing anything involving punct. I think punct == '░' is sufficiently unambiguous that it makes sense to provide the impl.

rust/library/proc_macro/src/quote.rs

Line 79 in 1899c48

TokenTree::Punct(ref tt) if tt.as_char() == '$' => {}

rust/library/proc_macro/src/quote.rs

Line 83 in 1899c48

if tt.as_char() == '$' {

rust/src/test/ui/suggestions/auxiliary/issue-61963.rs

Line 26 in 1899c48

if p.as_char() == '>' {

rust/src/test/ui/proc-macro/auxiliary/three-equals.rs

Line 23 in 1899c48

if tt.as_char() == '=' {

rust-highfive · 2020-11-01T17:51:05Z

r? @petrochenkov

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

dtolnay · 2020-11-01T21:55:49Z

@rfcbot fcp merge

rfcbot · 2020-11-01T21:55:49Z

Team member @dtolnay has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

rfcbot · 2020-11-12T22:40:57Z

🔔 This is now entering its final comment period, as per the review above. 🔔

rfcbot · 2020-11-22T22:51:58Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

petrochenkov · 2020-11-23T18:01:46Z

@bors r+

bors · 2020-11-23T18:01:48Z

📌 Commit 4652032 has been approved by petrochenkov

bors · 2020-11-24T00:30:31Z

⌛ Testing commit 4652032 with merge cb5b871...

bors · 2020-11-24T03:12:12Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing cb5b871 to master...

pthariensflame · 2021-01-01T06:55:40Z

relnotes needed?

Also, doesn't this violate symmetry of PartialEq without a similar-but-flipped impl?

petrochenkov · 2021-01-01T09:36:55Z

Marked with relnotes.

Also, doesn't this violate symmetry of PartialEq without a similar-but-flipped impl?

I assumed coherence wouldn't allow to add such a symmetric impl, but it's actually allowed.

@dtolnay or @pthariensflame, could you make a PR adding impl PartialEq<Punct> for char as well?
Asymmetric PartialEq (at compile time, not runtime) doesn't seem like a big deal to me, but looks like the documentation requires it - https://doc.rust-lang.org/stable/std/cmp/trait.PartialEq.html (the requirement was added in #20065).

pthariensflame · 2021-01-01T19:22:39Z

I'll make one today.

Also fixes the "since" version of the original.

`impl PartialEq<Punct> for char`; symmetry for rust-lang#78636 Also fixes the "since" version of the original. Pinging `@dtolnay` and `@petrochenkov.`

`impl PartialEq<Punct> for char`; symmetry for rust-lang#78636 Also fixes the "since" version of the original. Pinging ``@dtolnay`` and ``@petrochenkov.``

…laumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#80595 (`impl PartialEq<Punct> for char`; symmetry for rust-lang#78636) - rust-lang#81991 (Fix panic in 'remove semicolon' when types are not local) - rust-lang#82176 (fix MIR fn-ptr pretty-printing) - rust-lang#82244 (Keep consistency in example for Stdin StdinLock) - rust-lang#82260 (rustc: Show ``@path`` usage in stable) - rust-lang#82316 (Fix minor mistake in LTO docs.) - rust-lang#82332 (Don't generate src link on dummy spans) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Pkgsrc changes: * Adjust patches, re-compute line offsets, fix capitalization. * Remove i686/FreeBSD support, no longer provided upstream. * Bump bootstraps to 1.49.0. * Change USE_TOOLS from bsdtar to gtar. * Reduce diffs to pkgsrc-wip package patches. * Allow rust.BUILD_TARGET to override automatic choice of target. * Add an i586/NetBSD (pentium) bootstrap variant (needs testing), not yet added as bootstrap since 1.49 doesn't have that variant. Upstream changes: Version 1.50.0 (2021-02-11) ============================ Language ----------------------- - [You can now use `const` values for `x` in `[x; N]` array expressions.][79270] This has been technically possible since 1.38.0, as it was unintentionally stabilized. - [Assignments to `ManuallyDrop<T>` union fields are now considered safe.][78068] Compiler ----------------------- - [Added tier 3\* support for the `armv5te-unknown-linux-uclibceabi` target.][78142] - [Added tier 3 support for the `aarch64-apple-ios-macabi` target.][77484] - [The `x86_64-unknown-freebsd` is now built with the full toolset.][79484] \* Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries ----------------------- - [`proc_macro::Punct` now implements `PartialEq<char>`.][78636] - [`ops::{Index, IndexMut}` are now implemented for fixed sized arrays of any length.][74989] - [On Unix platforms, the `std::fs::File` type now has a "niche" of `-1`.][74699] This value cannot be a valid file descriptor, and now means `Option<File>` takes up the same amount of space as `File`. Stabilized APIs --------------- - [`bool::then`] - [`btree_map::Entry::or_insert_with_key`] - [`f32::clamp`] - [`f64::clamp`] - [`hash_map::Entry::or_insert_with_key`] - [`Ord::clamp`] - [`RefCell::take`] - [`slice::fill`] - [`UnsafeCell::get_mut`] The following previously stable methods are now `const`. - [`IpAddr::is_ipv4`] - [`IpAddr::is_ipv6`] - [`Layout::size`] - [`Layout::align`] - [`Layout::from_size_align`] - `pow` for all integer types. - `checked_pow` for all integer types. - `saturating_pow` for all integer types. - `wrapping_pow` for all integer types. - `next_power_of_two` for all unsigned integer types. - `checked_power_of_two` for all unsigned integer types. Cargo ----------------------- - [Added the `[build.rustc-workspace-wrapper]` option.][cargo/8976] This option sets a wrapper to execute instead of `rustc`, for workspace members only. - [`cargo:rerun-if-changed` will now, if provided a directory, scan the entire contents of that directory for changes.][cargo/8973] - [Added the `--workspace` flag to the `cargo update` command.][cargo/8725] Misc ---- - [The search results tab and the help button are focusable with keyboard in rustdoc.][79896] - [Running tests will now print the total time taken to execute.][75752] Compatibility Notes ------------------- - [The `compare_and_swap` method on atomics has been deprecated.][79261] It's recommended to use the `compare_exchange` and `compare_exchange_weak` methods instead. - [Changes in how `TokenStream`s are checked have fixed some cases where you could write unhygenic `macro_rules!` macros.][79472] - [`#![test]` as an inner attribute is now considered unstable like other inner macro attributes, and reports an error by default through the `soft_unstable` lint.][79003] - [Overriding a `forbid` lint at the same level that it was set is now a hard error.][78864] - [Dropped support for all cloudabi targets.][78439] - [You can no longer intercept `panic!` calls by supplying your own macro.][78343] It's recommended to use the `#[panic_handler]` attribute to provide your own implementation. - [Semi-colons after item statements (e.g. `struct Foo {};`) now produce a warning.][78296] [74989]: rust-lang/rust#74989 [79261]: rust-lang/rust#79261 [79896]: rust-lang/rust#79896 [79484]: rust-lang/rust#79484 [79472]: rust-lang/rust#79472 [79270]: rust-lang/rust#79270 [79003]: rust-lang/rust#79003 [78864]: rust-lang/rust#78864 [78636]: rust-lang/rust#78636 [78439]: rust-lang/rust#78439 [78343]: rust-lang/rust#78343 [78296]: rust-lang/rust#78296 [78068]: rust-lang/rust#78068 [75752]: rust-lang/rust#75752 [74699]: rust-lang/rust#74699 [78142]: rust-lang/rust#78142 [77484]: rust-lang/rust#77484 [cargo/8976]: rust-lang/cargo#8976 [cargo/8973]: rust-lang/cargo#8973 [cargo/8725]: rust-lang/cargo#8725 [`IpAddr::is_ipv4`]: https://doc.rust-lang.org/stable/std/net/enum.IpAddr.html#method.is_ipv4 [`IpAddr::is_ipv6`]: https://doc.rust-lang.org/stable/std/net/enum.IpAddr.html#method.is_ipv6 [`Layout::align`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.align [`Layout::from_size_align`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.from_size_align [`Layout::size`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.size [`Ord::clamp`]: https://doc.rust-lang.org/stable/std/cmp/trait.Ord.html#method.clamp [`RefCell::take`]: https://doc.rust-lang.org/stable/std/cell/struct.RefCell.html#method.take [`UnsafeCell::get_mut`]: https://doc.rust-lang.org/stable/std/cell/struct.UnsafeCell.html#method.get_mut [`bool::then`]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then [`btree_map::Entry::or_insert_with_key`]: https://doc.rust-lang.org/stable/std/collections/btree_map/enum.Entry.html#method.or_insert_with_key [`f32::clamp`]: https://doc.rust-lang.org/stable/std/primitive.f32.html#method.clamp [`f64::clamp`]: https://doc.rust-lang.org/stable/std/primitive.f64.html#method.clamp [`hash_map::Entry::or_insert_with_key`]: https://doc.rust-lang.org/stable/std/collections/hash_map/enum.Entry.html#method.or_insert_with_key [`slice::fill`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.fill

dtolnay added 2 commits November 1, 2020 09:38

Add PartialEq<char> for proc_macro::Punct

b017025

Add Punct PartialEq smoke test

4652032

rust-highfive assigned petrochenkov Nov 1, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2020

petrochenkov added I-nominated S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 1, 2020

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Nov 1, 2020

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Nov 12, 2020

m-ou-se removed I-nominated S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Nov 18, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 23, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2020

bors merged commit cb5b871 into rust-lang:master Nov 24, 2020

rustbot added this to the 1.50.0 milestone Nov 24, 2020

bors mentioned this pull request Nov 24, 2020

Implement PartialEq for proc_macro::Ident == strings #78634

Closed

dtolnay deleted the puncteq branch November 24, 2020 22:07

spastorino removed the to-announce Announce this issue on triage meeting label Dec 3, 2020

petrochenkov added the relnotes Marks issues that should be documented in the release notes of the next release. label Jan 1, 2021

petrochenkov mentioned this pull request Jan 1, 2021

impl PartialEq<Punct> for char; symmetry for #78636 #80595

Merged

pthariensflame added a commit to pthariensflame/rust that referenced this pull request Feb 20, 2021

impl PartialEq<Punct> for char; symmetry for rust-lang#78636

1839748

Also fixes the "since" version of the original.

Dylan-DPC-zz mentioned this pull request Feb 20, 2021

Rollup of 10 pull requests #82330

Closed

GuillaumeGomez mentioned this pull request Feb 20, 2021

Rollup of 7 pull requests #82341

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PartialEq<char> for proc_macro::Punct #78636

Add PartialEq<char> for proc_macro::Punct #78636

dtolnay commented Nov 1, 2020

rust-highfive commented Nov 1, 2020

dtolnay commented Nov 1, 2020

rfcbot commented Nov 1, 2020 •

edited by sfackler

Loading

rfcbot commented Nov 12, 2020

rfcbot commented Nov 22, 2020

petrochenkov commented Nov 23, 2020

bors commented Nov 23, 2020

bors commented Nov 24, 2020

bors commented Nov 24, 2020

pthariensflame commented Jan 1, 2021

petrochenkov commented Jan 1, 2021

pthariensflame commented Jan 1, 2021

Add PartialEq<char> for proc_macro::Punct #78636

Add PartialEq<char> for proc_macro::Punct #78636

Conversation

dtolnay commented Nov 1, 2020

rust-highfive commented Nov 1, 2020

dtolnay commented Nov 1, 2020

rfcbot commented Nov 1, 2020 • edited by sfackler Loading

rfcbot commented Nov 12, 2020

rfcbot commented Nov 22, 2020

petrochenkov commented Nov 23, 2020

bors commented Nov 23, 2020

bors commented Nov 24, 2020

bors commented Nov 24, 2020

pthariensflame commented Jan 1, 2021

petrochenkov commented Jan 1, 2021

pthariensflame commented Jan 1, 2021

rfcbot commented Nov 1, 2020 •

edited by sfackler

Loading