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

Update tidy script, replace XXX with FIXME #13378

Closed
wants to merge 1 commit into from
Closed

Update tidy script, replace XXX with FIXME #13378

wants to merge 1 commit into from

Conversation

JIghtuse
Copy link
Contributor

@JIghtuse JIghtuse commented Apr 7, 2014

No description provided.

match = re.match(r'^.*//!?\s*XXX', line)
if match:
report_err("XXX is no longer necessary, use FIXME")
match = re.match(r'^.*/\*\s*XXX', line)
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this and above be refactored with a binary and?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I think it is even possible to make one regexp instead of two. I'll try to merge them.

@JIghtuse
Copy link
Contributor Author

JIghtuse commented Apr 7, 2014

Something like this.
I checked it for the lines I removed above, works fine.

@alexcrichton
Copy link
Member

Could you squash these into one commit, otherwise this looks good to me, thanks!

@JIghtuse
Copy link
Contributor Author

JIghtuse commented Apr 7, 2014

Done!

@alexcrichton
Copy link
Member

It looks like a rebase went a little awry (seems to have picked up an extra commit), perhaps a git rebase -i is in order?

@JIghtuse
Copy link
Contributor Author

JIghtuse commented Apr 7, 2014

Yeah, something goes wrong. How can I revert it back? Rebase it again?

@alexcrichton
Copy link
Member

If you rebase on to a recent master it will likely go away (git rebase origin/master), and otherwise you might be able to use git rebase -i to remove the specific commit.

Few places where previous version of tidy script cannot find XXX:
* inside one-line comment preceding by a few spaces;
* inside multiline comments (now it finds it if multiline comment starts
on the same line with XXX).

Change occurences of XXX found by new tidy script.
@JIghtuse
Copy link
Contributor Author

JIghtuse commented Apr 7, 2014

I think it is fixed now. I probably squashed first one more commit than I need. Thanks to o11c I found a way to fix it with git reflog

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants