escape_ascii take 2 #83130

clarfonthey · 2021-03-14T22:05:58Z

The previous PR, #73111 was closed for inactivity; since I've had trouble in the past reopening closed PRs, I'm just making a new one.

I'm still running the tests locally but figured I'd open the PR in the meantime. Will fix whatever errors show up so we don't have to wait again for this.

r? @m-ou-se

library/core/src/slice/ascii.rs

joshtriplett · 2021-03-16T07:20:24Z

This seems reasonable to me. I'm 👍 on adding these, though given the amount of previous discussion I think this one might warrant a full FCP.

clarfonthey · 2021-03-17T05:50:14Z

To be clear, it's 100% unstable so regardless there would still be an FCP before anything is set in stone.

library/core/src/num/mod.rs

m-ou-se · 2021-03-27T10:40:43Z

Thanks!

@bors r+

bors · 2021-03-27T10:40:45Z

📌 Commit 77a5fe9 has been approved by m-ou-se

escape_ascii take 2 The previous PR, rust-lang#73111 was closed for inactivity; since I've had trouble in the past reopening closed PRs, I'm just making a new one. I'm still running the tests locally but figured I'd open the PR in the meantime. Will fix whatever errors show up so we don't have to wait again for this. r? `@m-ou-se`

escape_ascii take 2 The previous PR, rust-lang#73111 was closed for inactivity; since I've had trouble in the past reopening closed PRs, I'm just making a new one. I'm still running the tests locally but figured I'd open the PR in the meantime. Will fix whatever errors show up so we don't have to wait again for this. r? ``@m-ou-se``

Rollup of 8 pull requests Successful merges: - rust-lang#81351 (combine: stop eagerly evaluating consts) - rust-lang#82525 (make unaligned_references future-incompat lint warn-by-default) - rust-lang#82626 (update array missing `IntoIterator` msg) - rust-lang#82917 (Add function core::iter::zip) - rust-lang#82993 (rustdoc: Use diagnostics for error when including sources) - rust-lang#83522 (Improve fs error open_from unix) - rust-lang#83548 (Always preserve `None`-delimited groups in a captured `TokenStream`) - rust-lang#83555 (Add #[inline] to io::Error methods) Failed merges: - rust-lang#83130 (escape_ascii take 2) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2021-03-27T22:43:29Z

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

bors · 2021-03-28T19:48:12Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout escape (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self escape --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging library/core/src/slice/mod.rs
Auto-merging library/core/src/slice/ascii.rs
CONFLICT (content): Merge conflict in library/core/src/slice/ascii.rs
Automatic merge failed; fix conflicts and then commit the result.

clarfonthey · 2021-03-29T01:07:40Z

(Rebased, includes the commit you made)

m-ou-se · 2021-03-29T19:14:16Z

@bors r+

bors · 2021-03-29T19:14:17Z

📌 Commit c20ba9c has been approved by m-ou-se

escape_ascii take 2 The previous PR, rust-lang#73111 was closed for inactivity; since I've had trouble in the past reopening closed PRs, I'm just making a new one. I'm still running the tests locally but figured I'd open the PR in the meantime. Will fix whatever errors show up so we don't have to wait again for this. r? `@m-ou-se`

Rollup of 7 pull requests Successful merges: - rust-lang#82331 (alloc: Added `as_slice` method to `BinaryHeap` collection) - rust-lang#83130 (escape_ascii take 2) - rust-lang#83374 (unix: Fix feature(unix_socket_ancillary_data) on macos and other BSDs) - rust-lang#83543 (Lint on unknown intra-doc link disambiguators) - rust-lang#83636 (Add a regression test for issue-82792) - rust-lang#83643 (Remove a FIXME resolved by rust-lang#73578) - rust-lang#83644 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned m-ou-se Mar 14, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2021

This comment has been minimized.

Sign in to view

camelid reviewed Mar 14, 2021

View reviewed changes

library/core/src/slice/ascii.rs Outdated Show resolved Hide resolved

camelid added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Mar 14, 2021

clarfonthey force-pushed the escape branch from 844f261 to 7157655 Compare March 15, 2021 00:19

clarfonthey force-pushed the escape branch from 7157655 to 6e9cea9 Compare March 22, 2021 19:43

m-ou-se mentioned this pull request Mar 27, 2021

Tracking Issue for inherent_ascii_escape #77174

Closed

5 tasks

m-ou-se reviewed Mar 27, 2021

View reviewed changes

library/core/src/num/mod.rs Outdated Show resolved Hide resolved

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 27, 2021

Dylan-DPC-zz mentioned this pull request Mar 27, 2021

Rollup of 8 pull requests #83562

Closed

Dylan-DPC-zz mentioned this pull request Mar 27, 2021

Rollup of 8 pull requests #83566

Closed

Dylan-DPC-zz mentioned this pull request Mar 27, 2021

Rollup of 8 pull requests #83580

Merged

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 27, 2021

Add escape_default method to u8 and [u8]

c20ba9c

clarfonthey force-pushed the escape branch from 77a5fe9 to c20ba9c Compare March 28, 2021 21:38

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 29, 2021

This was referenced Mar 29, 2021

Rollup of 6 pull requests #83658

Closed

Rollup of 7 pull requests #83664

Merged

bors merged commit 68964d1 into rust-lang:master Mar 30, 2021

rustbot added this to the 1.53.0 milestone Mar 30, 2021

clarfonthey deleted the escape branch April 19, 2021 22:00

thomcc mentioned this pull request Jul 29, 2022

Panic in escape_ascii().len() #99878

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

escape_ascii take 2 #83130

escape_ascii take 2 #83130

clarfonthey commented Mar 14, 2021

This comment has been minimized.

joshtriplett commented Mar 16, 2021 •

edited

Loading

clarfonthey commented Mar 17, 2021

m-ou-se commented Mar 27, 2021

bors commented Mar 27, 2021

bors commented Mar 27, 2021

bors commented Mar 28, 2021

clarfonthey commented Mar 29, 2021

m-ou-se commented Mar 29, 2021

bors commented Mar 29, 2021

escape_ascii take 2 #83130

escape_ascii take 2 #83130

Conversation

clarfonthey commented Mar 14, 2021

This comment has been minimized.

joshtriplett commented Mar 16, 2021 • edited Loading

clarfonthey commented Mar 17, 2021

m-ou-se commented Mar 27, 2021

bors commented Mar 27, 2021

bors commented Mar 27, 2021

bors commented Mar 28, 2021

clarfonthey commented Mar 29, 2021

m-ou-se commented Mar 29, 2021

bors commented Mar 29, 2021

joshtriplett commented Mar 16, 2021 •

edited

Loading