-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Remove owned string literal #13548
Remove owned string literal #13548
Conversation
So having played with this a little.. should I be using the This upsets a LOT of checking because of how much longer it makes lines that include more than one string. |
I broke a bunch of tests while I was doing this, I think (based on my Regardless I'll rebase and push now. |
(FWIW rustc builds and does reasonable things with my stripe bindings after this patch) |
Rebased. |
@richo GitHub still says it can't merge. Maybe something landed that conflicted after you rebased (perhaps another good reason to do this type of change in small chunks). |
Entirely valid. Should I split this into per-file commits maybe? |
I just rebased again. Assuming noone pushes anything conflicting before you get a chance to look at it, this should be merge-able, but I'm open to the idea of splitting this up a bit. My only real concern is the amount of merge bubbles I'll create by doing this one lib at a time. Totall appreciate you working with me on this though :) |
I'm getting this failure locally too:
Is this a bootstrapping issue? eg, it's building a stage with a rustc too old to know about it? |
@richo No, probably not. The |
Thanks, I was just about to push changes backing out of the change in those modules, but instead I'll fix it. I won't push again till the tests pass locally. |
That unused import warning is a bug, since StrSlice is used in both a |
@@ -9,7 +9,8 @@ | |||
// except according to those terms. | |||
|
|||
fn foo(b: bool) -> Result<bool,~str> { | |||
Err(~"bar"); //~ ERROR: cannot determine a type for this expression: unconstrained type | |||
//~ ERROR: cannot determine a type for this expression: unconstrained type |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be written as:
Err(...);
//~^ ERROR: cannot determine a type for this expression: unconstrained type
The line with the error should go right next to the statement that should fail. If there's a tidy error, you can do what I've done in the example above. That is, put the expected error in the line below and use a ^
to specify that the expected error should be raised by the line above the comment.
Thanks for all the feedback! Updateing now. |
I think the tests all pass locally (I'm waiting on |
And the tests pass!! \o/ /cc @brson |
Since I never get to this before it goes stale, I've rebased and pushed to my own branch to land: #13607 It should land today. Thanks for your patience! |
Fix `tt::Punct`'s spacing calculation Fixes rust-lang#13499 We currently set a `tt::Punct`'s spacing to `Spacing::Joint` unless its next token is a trivia (i.e. whitespaces or comment). As I understand it, rustc only [sets `Spacing::Joint` if the next token is an operator](https://github.com/rust-lang/rust/blob/5b3e9090757da9a95b22f589fe39b6a4b5455b96/compiler/rustc_parse/src/lexer/tokentrees.rs#L77-L78) and we should follow it to guarantee the consistent behavior of proc macros.
internal: Update proc-macro-srv tests Should have been included in rust-lang#13548, but I didn't notice as those tests aren't run in our CI. cc rust-lang#104454
…ter_map_some, r=llogiq fix: remove unnecessary filter_map usages fixes rust-lang/rust-clippy#12556 (Fixed version of rust-lang/rust-clippy#12766) changelog: [unnecessary_filter_map]: filter map improvements
Had a quick stab at this with a sed macro.
Fixed a lot of strings, but there's a bunch of tidy errors because of the increased line lengths now, definitely some broken tests, and isn't complete.
Pushing purely so that there's state on this. /cc #13543