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

Move ascii::escape_default to libcore #48735

Merged
merged 15 commits into from
Mar 13, 2018
Merged

Move ascii::escape_default to libcore #48735

merged 15 commits into from
Mar 13, 2018

Conversation

1011X
Copy link
Contributor

@1011X 1011X commented Mar 4, 2018

As requested in #46409, the ascii::escape_default method has been added to the core library. All I did was copy over the std::ascii module file, remove the (redundant) AsciiExt trait, and change some of the documentation to match. None of the tests were changed.

I wasn't sure how to handle the annotations. For EscapeDefault and escape_default(), I changed them to #[unstable(feature = "core_ascii", issue = "46409")]. Is that alright? Or should I leave them as they were?

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2018
@1011X
Copy link
Contributor Author

1011X commented Mar 5, 2018

I changed the annotations to stable with the version as 1.26.0, which is the current nightly version.

@Mark-Simulacrum
Copy link
Member

r? @BurntSushi

@BurntSushi
Copy link
Member

I don't know what our decision procedure is for moving things into core. @alexcrichton?

@alexcrichton
Copy link
Member

Ah I think we'd go through the normal FCP process for this as it would be an insta-stable definition in libcore. @1011X I'd sort of expect though for the original definition to be deleted from somewhere, does that still need to happen?

Also currently libcore for various technical reasons the tests go in src/libcore/tests unlike other libraries where it's indeed inline with the source itself.

@1011X
Copy link
Contributor Author

1011X commented Mar 5, 2018

Oh right, I'll delete them from std and re-export the ones in core, and move the tests as well. My bad, I'm still figuring out how std and core are organized.

Since the tests are the same, should I delete the ones in std::ascii?

@alexcrichton
Copy link
Member

Yeah no need to duplicate the tests as well, thanks!

@bors
Copy link
Contributor

bors commented Mar 6, 2018

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

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2018
@kennytm kennytm added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Mar 6, 2018
@alexcrichton
Copy link
Member

@1011X oh I think there's also a modification necessary in src/libcore/tests/mod.rs to actually bring the tests in as well?

Otherwise this looks good to me, thanks!

@rfcbot fcp merge

@rfcbot rfcbot added the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Mar 8, 2018
@rfcbot
Copy link

rfcbot commented Mar 8, 2018

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

No concerns currently listed.

Once a majority of reviewers approve (and none object), 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.

@alexcrichton alexcrichton added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 8, 2018
@rfcbot 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 Mar 8, 2018
@rfcbot
Copy link

rfcbot commented Mar 8, 2018

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

@1011X
Copy link
Contributor Author

1011X commented Mar 9, 2018

@alexcrichton Got it! Thanks for the help :)

@alexcrichton
Copy link
Member

Looks like CI may have some errors?

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit 1a16271 has been approved by alexcrichton

@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 Mar 12, 2018
@bors
Copy link
Contributor

bors commented Mar 13, 2018

⌛ Testing commit 1a16271 with merge c290857...

bors added a commit that referenced this pull request Mar 13, 2018
Move ascii::escape_default to libcore

As requested in #46409, the `ascii::escape_default` method has been added to the core library. All I did was copy over the `std::ascii` module file, remove the (redundant) `AsciiExt` trait, and change some of the documentation to match. None of the tests were changed.

I wasn't sure how to handle the annotations. For `EscapeDefault` and `escape_default()`, I changed them to `#[unstable(feature = "core_ascii", issue = "46409")]`. Is that alright? Or should I leave them as they were?
@bors
Copy link
Contributor

bors commented Mar 13, 2018

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

@bors bors merged commit 1a16271 into rust-lang:master Mar 13, 2018
bors added a commit that referenced this pull request Apr 9, 2018
Correct a few stability attributes

* `const_indexing` language feature was stabilized in 1.26.0 by #46882
* `Display` impls for `PanicInfo` and `Location` were stabilized in 1.26.0 by #47687
* `TrustedLen` is still unstable so its impls should be as well even though `RangeInclusive` was stabilized by #47813
* `!Send` and `!Sync` for `Args` and `ArgsOs` were stabilized in 1.26.0 by #48005
* `EscapeDefault` has been stable since 1.0.0 so should continue to show that even though it was moved to core in #48735

This could be backported to beta like #49612
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants