Skip to content

More methods for str boxes. (reduce Box<[u8]> ↔ Box<str> transmutes) - #41258

Merged
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:str_box_extras
Apr 26, 2017
Merged

More methods for str boxes. (reduce Box<[u8]> ↔ Box<str> transmutes)#41258
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:str_box_extras

Conversation

@clarfonthey

@clarfontheyclarfonthey commented Apr 12, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

This is a follow-up to #41096 that adds safer methods for converting between Box<str> and Box<[u8]>. They're gated under a different feature from the &mut str methods because they may be too niche to include in public APIs, although having them internally helps reduce the number of transmutes the standard library uses.

What's added:

  • From<Box<str>> for Box<[u8]>
  • <Box<str>>::into_boxed_bytes (just calls Into::into)
  • alloc::str (new module)
  • from_boxed_utf8 and from_boxed_utf8_unchecked, defined in alloc:str, exported in collections::str
  • exports from_utf8_mut in collections::str (missed from previous PR)

@rust-highfive

rust-highfive commented Apr 12, 2017

Copy link
Copy Markdown
Contributor

r? @brson

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

@clarfontheyclarfonthey changed the title More methods for str boxes.More methods for str boxes. (reduce Box<[u8]> ↔ Box<str> transmutes)Apr 12, 2017
@clarfontheyclarfonthey mentioned this pull request Apr 12, 2017
Closed
@clarfonthey
clarfontheyforce-pushed the str_box_extras branch 12 times, most recently from 62b6205 to 15a8d38CompareApril 13, 2017 01:31
@alexcrichtonalexcrichton added the T-libs-api [DEPRECATED; DO NOT USE] label Apr 13, 2017
@clarfonthey
clarfontheyforce-pushed the str_box_extras branch 4 times, most recently from 116c9be to 112459dCompareApril 13, 2017 18:08
@shepmaster

shepmaster commented Apr 14, 2017

Copy link
Copy Markdown
Member

@brson's going to be globe-trotting for a bit, so...

r? @Kimundi

@rust-highfiverust-highfive assigned Kimundi and unassigned brsonApr 14, 2017
@arielb1arielb1 added S-waiting-on-team S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-team labels Apr 15, 2017
@arielb1

arielb1 commented Apr 18, 2017

Copy link
Copy Markdown
Contributor

Thanks for the PR @clarcharr! Sorry for the delay - half of the team was on spring vacation. @Kimundi or some other reviewer will be looking at your PR soon.

@clarfonthey

clarfonthey commented Apr 18, 2017

Copy link
Copy Markdown
ContributorAuthor

No problem! Whenever someone gets around to it. :)

@bors

bors commented Apr 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 112459d has been approved by Kimundi

@bors

bors commented Apr 20, 2017

Copy link
Copy Markdown
Collaborator

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

@frewsxcv

frewsxcv commented Apr 20, 2017

Copy link
Copy Markdown
Contributor

FYI, my PR #41295 just landed which made a couple organizational changes to the Unstable Book. Namely, features are now divided into 'language features' and 'library features' which are different directories, so you'll unfortunately have to address the conflicts. You should be able to just run ./x.py test src/tools/tidy to see what needs to be changed after rebasing/merging in master. Sorry for the inconvenience and if you need any help with that let me know! I can address the merge conflicts for you if you want.

@bors

bors commented Apr 20, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@clarfonthey

clarfonthey commented Apr 20, 2017

Copy link
Copy Markdown
ContributorAuthor

Just rebased!

frewsxcv
frewsxcv reviewed Apr 20, 2017
View reviewed changes
Comment threadsrc/doc/unstable-book/src/SUMMARY.md Outdated

@frewsxcvfrewsxcvApr 20, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

libaryr

😬

@clarfontheyclarfontheyApr 20, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

shhhhhhh

@clarfonthey

clarfonthey commented Apr 21, 2017

Copy link
Copy Markdown
ContributorAuthor

(Rebased a second time and now it passes.)

@alexcrichton

alexcrichton commented Apr 21, 2017

Copy link
Copy Markdown
Member

Hm so looking this over, I fear that we're getting too aggressive with all of these conversions. For example functions like from_boxed_utf8 seem like you wouldn't actually wish to call them because in the case of a failure you lose the entire allocation.

@shepmastershepmaster 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 Apr 21, 2017
@clarfonthey

clarfonthey commented Apr 21, 2017

Copy link
Copy Markdown
ContributorAuthor

That makes sense! I can remove that function for now if that seems best.

@alexcrichton

alexcrichton commented Apr 21, 2017

Copy link
Copy Markdown
Member

Ok, let's remove that function.

@clarfonthey

clarfonthey commented Apr 21, 2017

Copy link
Copy Markdown
ContributorAuthor

Removed for now. I also marked the alloc::str module itself as unstable.

@alexcrichton

alexcrichton commented Apr 24, 2017

Copy link
Copy Markdown
Member

Looks like Travis is failing?

@clarfonthey

clarfonthey commented Apr 24, 2017

Copy link
Copy Markdown
ContributorAuthor

Hopefully it should be fixed once Travis finishes!

@clarfonthey

clarfonthey commented Apr 25, 2017

Copy link
Copy Markdown
ContributorAuthor

(Travis passes.)

@alexcrichton

alexcrichton commented Apr 26, 2017

Copy link
Copy Markdown
Member

@bors: r=Kimundi

@bors

bors commented Apr 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c66c6e9 has been approved by Kimundi

@bors

bors commented Apr 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c66c6e9 with merge dad9814...

bors added a commit that referenced this pull request Apr 26, 2017
@bors
Auto merge of#41258- clarcharr:str_box_extras, r=Kimundi
dad9814
More methods for str boxes. (reduce Box<[u8]> ↔ Box<str> transmutes)
This is a follow-up to #41096 that adds safer methods for converting between `Box<str>` and `Box<[u8]>`. They're gated under a different feature from the `&mut str` methods because they may be too niche to include in public APIs, although having them internally helps reduce the number of transmutes the standard library uses.
What's added:
* `From<Box<str>> for Box<[u8]>`
* `<Box<str>>::into_boxed_bytes` (just calls `Into::into`)
* `alloc::str` (new module)
* `from_boxed_utf8` and `from_boxed_utf8_unchecked`, defined in `alloc:str`, exported in `collections::str`
* exports `from_utf8_mut` in `collections::str` (missed from previous PR)
@bors

bors commented Apr 26, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: Kimundi
Pushing dad9814 to master...

@bors
bors merged commit c66c6e9 into rust-lang:masterApr 26, 2017
@borsbors mentioned this pull request Apr 26, 2017
Closed
@clarfonthey
clarfonthey deleted the str_box_extras branch April 28, 2017 17:47
@eliminmaxeliminmax mentioned this pull request Jan 30, 2026
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@frewsxcvfrewsxcvfrewsxcv left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@KimundiKimundi

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@clarfonthey@rust-highfive@shepmaster@arielb1@Kimundi@alexcrichton@bors@frewsxcv@brson