Features/strbuf to string #14323
Features/strbuf to string #14323
Conversation
|
No idea if the tests pass- I have to run home so I killed the run. I'll run them again later tonight. |
|
Thanks for doing this! |
|
Tests look fine. Should I just rebase this on top of #14310 ? |
|
I think the only thing I didn't consider here was what to do with |
|
#14310 has landed, I'm going to rebase this and include to_string |
|
|
|
I would somewhat in favour of removing |
|
Yeah, I'm not super excited about having to_str and to_string in the language. I think my plan is get the new types in (StrBuf -> String) and then fiddle with the internals of to_str{,ing} unless there's strong objection. |
|
It's all gotta happen eventually! (small incremental steps is fine). Another contender is to remove |
|
I feel like the right solution is to use |
|
It's landed. |
|
Oh wow, when did that happen? I only pulled a few hours ago, and I didn't see bors say anything in #rust-internals. But you're right, it's in master. \o/ |
|
And of course the website hasn't updated with the new docs. |
|
Half an hour ago. (I'm inclined to agree with just using the |
|
PR Updated. Stage0 built ok locally but I'm on battery so letting travis deal with testing. |
|
Sorry, left breaking-change out of the commit message. r? |
|
Looks like the bors queue is empty, now's my chance to get this in! r? |
| /*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} |
There was a problem hiding this comment.
I find it unlikely that any change to this file is correct and I can't tell from github's diff what the change is, could you revert it?
There was a problem hiding this comment.
Yup, good catch, thanks.
There was a problem hiding this comment.
Did you revert it? it's still listed here in the diff.
There was a problem hiding this comment.
The difference is a trailing newline was added to the file, just like in main.css. Nothing else changed.
There was a problem hiding this comment.
Ok. (I don't see that in Github's diff, did you look locally?)
|
Updated again. I'm building a stage1 now to sanity check, because I resolved the conflicts by hand instead of redoing the patch. |
|
I'm not sure how but it appears that my changes broke this because those strings are now 49 bytes long? Oh wait, it includes the content of the file. One sec, fixing. |
|
I think the problem is adding trailing newlines to a lot of files, including those ones. |
|
Yup. Posix does demand that files have trailing newlines. I'm going to update the test cases to reflect that. |
[breaking-change]
|
Updated. As an aside, does the full test suite not run on travis? it seemed to pass that builds. |
Converts `StrBuf` to `String` throughout rustc and the standard library. Tests all pass locally, but usual caveats about platforms that aren't OSX apply since I don't have a test environment handy. @alexcritchon mentioned that @pcwalton may have a patch incoming that should block this? closes #14312
|
Yes, our testsuite takes too long to run and so it would be abusing Travis' infrastructure (and probably exceed their time limits). The .travis.yml file lists the targets that are tested. |
|
\o/ nice! |
|
\o/ I'll make some more ground tonight, this one was the big pain to get in Thanks for your help!
|
…alexcrichton This should block on #14323
…Veykril Fix overlap deduping infinite loop Fixes: rust-lang#14276
Converts
StrBuftoStringthroughout rustc and the standard library.Tests all pass locally, but usual caveats about platforms that aren't OSX apply since I don't have a test environment handy.
@alexcritchon mentioned that @pcwalton may have a patch incoming that should block this?
closes #14312