Skip to content
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

Constify [u8]::is_ascii (unstably) #111222

Merged
merged 3 commits into from
May 7, 2023
Merged

Conversation

scottmcm
Copy link
Member

@scottmcm scottmcm commented May 4, 2023

UTF-8 checking in const fn-stabilized back in 1.63 (#97367), but apparently somehow ASCII checking was never const-ified, despite being simpler.

New constness-tracking issue for is_ascii: #111090

I noticed this working on ascii::Char: #110998

UTF-8 checking in `const fn`-stabilized back in 1.63, but apparently somehow ASCII checking was never const-ified, despite being simpler.
@rustbot
Copy link
Collaborator

rustbot commented May 4, 2023

r? @Mark-Simulacrum

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 4, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 4, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@BurntSushi
Copy link
Member

LGTM

// FIXME: once iterators and closures can be used in `const fn`,
// return s.iter().all(|b| b.is_ascii());
let mut i = 0;
while i < len {
Copy link
Member

Choose a reason for hiding this comment

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

Instead of having to maintain an index, you could also use slice patterns to fake iteration:

while let [next, rest @ ..] = slice {
  slice = rest;
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, you got me curious, so I tuned the heck out of it.

Looks like going backwards is the best in both LLVM and cg_gcc: https://rust.godbolt.org/z/K1rKs1T4d

@thomcc
Copy link
Member

thomcc commented May 6, 2023

r? @thomcc

@bors r+

@bors
Copy link
Contributor

bors commented May 6, 2023

📌 Commit 9de3d01 has been approved by thomcc

It is now in the queue for this repository.

@rustbot rustbot assigned thomcc and unassigned Mark-Simulacrum May 6, 2023
@bors 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 May 6, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2023
Constify `[u8]::is_ascii` (unstably)

UTF-8 checking in `const fn`-stabilized back in 1.63 (rust-lang#97367), but apparently somehow ASCII checking was never const-ified, despite being simpler.

New constness-tracking issue for `is_ascii`: rust-lang#111090

I noticed this working on `ascii::Char`: rust-lang#110998
@matthiaskrgr
Copy link
Member

@bors r-
#111283 (comment)

@bors 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 May 6, 2023
@scottmcm
Copy link
Member Author

scottmcm commented May 7, 2023

Ok, I think I've fixed up the test. I'll iffy it just in case.
@bors r=thomcc rollup=iffy

@bors
Copy link
Contributor

bors commented May 7, 2023

📌 Commit c8c5a58 has been approved by thomcc

It is now in the queue for this repository.

@bors 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 May 7, 2023
@bors
Copy link
Contributor

bors commented May 7, 2023

⌛ Testing commit c8c5a58 with merge 613a5c9...

@bors
Copy link
Contributor

bors commented May 7, 2023

☀️ Test successful - checks-actions
Approved by: thomcc
Pushing 613a5c9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 7, 2023
@bors bors merged commit 613a5c9 into rust-lang:master May 7, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 7, 2023
@scottmcm scottmcm deleted the constify-is_ascii branch May 7, 2023 17:59
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (613a5c9): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.8% [0.8%, 0.8%] 1
Regressions ❌
(secondary)
2.8% [2.8%, 2.8%] 1
Improvements ✅
(primary)
-0.1% [-0.1%, -0.1%] 1
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) 0.4% [-0.1%, 0.8%] 2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 653.81s -> 654.562s (0.12%)

@coolreader18
Copy link
Contributor

Hah, I had a precursor in #104126, though this one's much nicer. I'll keep that one open for eq_ignore_ascii_case, I guess.

@scottmcm
Copy link
Member Author

Oh, sorry @coolreader18 -- I didn't even think to look if someone had already done it.

@coolreader18
Copy link
Contributor

No worries! I'm glad it's now possible to do it where const_eval_select isn't necessary

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants