Pull Request for #22721

[munds]

This is my first time doing this, so not entirely sure if I'm doing it right. Please let me know if I made any blunders :)

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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. 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 CONTRIBUTING.md for more information.

[steveklabnik]

Hey @mund!

Everything is right here, except one detail: this can't be merged, because there are some conflicts. It seems like you also have some extra commits you didn't intend to get here, as well. If you fix up your master branch and then force push, github will update the pull request.

[alexcrichton]

r? @steveklabnik

[munds]

r? @steveklabnik

I reverted back to the only commit that was supposed to get here ... I think?

[gamazeps]

@mund you still have inapropriate commits.

What you could do is an interactive rebase, it's quite a powerfull feature of git.
Here the command you could do is (according to your fork of rust)
$ git rebase -i f0f7ca27de6 # tells git what is the last commit it should consider
There it will open a file in your default editor, simply erase the line with the commits you do not want.
You should just keep the line: Modified L1247 of src/libsyntax/ast.rs

Eventually force push your updated master branch to github.

You should take a look at how to use branches and the rebase command, it will be of tremendous use for you in the long run :)

[steveklabnik]

This landed in #23179. Thanks!