Merge pull request #327 from jhg/issue_900_of_rustc_dev_guide

Remove recommendation about how to add changes to the pull request

Author: Mark-Simulacrum

highfive/newpr.py

@@ -22,8 +22,6 @@
 welcome_without_reviewer = "@nrc (NB. this repo may be misconfigured)"
 raw_welcome = """Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from %s 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](%s) for more information.
 """
 

highfive/tests/test_integration_tests.py

@@ -103,7 +103,7 @@ def test_new_pr_non_contributor(self):
                 (
                     'POST', newpr.post_comment_url % ('rust-lang', 'rust', '7'),
                     {
-                        'body': "Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.\n\nIf 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.\n\nPlease see [the contribution instructions](https://rustc-dev-guide.rust-lang.org/contributing.html) for more information.\n"}
+                        'body': "Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.\n\nPlease see [the contribution instructions](https://rustc-dev-guide.rust-lang.org/contributing.html) for more information.\n"}
                 ),
                 {'body': {}},
             ),
@@ -145,7 +145,7 @@ def test_new_pr_empty_body(self):
                 (
                     'POST', newpr.post_comment_url % ('rust-lang', 'rust', '7'),
                     {
-                        'body': "Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.\n\nIf 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.\n\nPlease see [the contribution instructions](https://rustc-dev-guide.rust-lang.org/contributing.html) for more information.\n"}
+                        'body': "Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.\n\nPlease see [the contribution instructions](https://rustc-dev-guide.rust-lang.org/contributing.html) for more information.\n"}
                 ),
                 {'body': {}},
             ),

highfive/tests/test_newpr.py

@@ -112,8 +112,6 @@ class TestNewPRGeneral(TestNewPR):
     def test_welcome_msg(self):
         base_msg = """Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from %s 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](%s) for more information.
 """