Fix args ordering in macros

Author: joshua-k-harris

docs/copy_directory_doc.md

@@ -11,7 +11,7 @@ on Windows (no Bash is required).
 ## copy_directory
 
 <pre>
-copy_directory(<a href="#copy_directory-name">name</a>, <a href="#copy_directory-src">src</a>, <a href="#copy_directory-out">out</a>, <a href="#copy_directory-progress_message">progress_message</a>, <a href="#copy_directory-mnemonic">mnemonic</a>, <a href="#copy_directory-kwargs">kwargs</a>)
+copy_directory(<a href="#copy_directory-name">name</a>, <a href="#copy_directory-src">src</a>, <a href="#copy_directory-out">out</a>, <a href="#copy_directory-mnemonic">mnemonic</a>, <a href="#copy_directory-progress_message">progress_message</a>, <a href="#copy_directory-kwargs">kwargs</a>)
 </pre>
 
 Copies a directory to another location.
@@ -33,8 +33,8 @@ for more context.
 | <a id="copy_directory-name"></a>name |  Name of the rule.   |  none |
 | <a id="copy_directory-src"></a>src |  The directory to make a copy of. Can be a source directory or TreeArtifact.   |  none |
 | <a id="copy_directory-out"></a>out |  Path of the output directory, relative to this package.   |  none |
-| <a id="copy_directory-progress_message"></a>progress_message |  A custom action progress message.   |  <code>"Copying directory %{input}"</code> |
 | <a id="copy_directory-mnemonic"></a>mnemonic |  A custom action mnemonic.   |  <code>"CopyDirectory"</code> |
+| <a id="copy_directory-progress_message"></a>progress_message |  A custom action progress message.   |  <code>"Copying directory %{input}"</code> |
 | <a id="copy_directory-kwargs"></a>kwargs |  further keyword arguments, e.g. <code>visibility</code>   |  none |
 
 

docs/copy_file_doc.md

@@ -14,7 +14,7 @@ on Windows (no Bash is required).
 ## copy_file
 
 <pre>
-copy_file(<a href="#copy_file-name">name</a>, <a href="#copy_file-src">src</a>, <a href="#copy_file-out">out</a>, <a href="#copy_file-is_executable">is_executable</a>, <a href="#copy_file-allow_symlink">allow_symlink</a>, <a href="#copy_file-progress_message">progress_message</a>, <a href="#copy_file-mnemonic">mnemonic</a>, <a href="#copy_file-kwargs">kwargs</a>)
+copy_file(<a href="#copy_file-name">name</a>, <a href="#copy_file-src">src</a>, <a href="#copy_file-out">out</a>, <a href="#copy_file-is_executable">is_executable</a>, <a href="#copy_file-allow_symlink">allow_symlink</a>, <a href="#copy_file-mnemonic">mnemonic</a>, <a href="#copy_file-progress_message">progress_message</a>, <a href="#copy_file-kwargs">kwargs</a>)
 </pre>
 
 Copies a file to another location.
@@ -34,8 +34,8 @@ This rule uses a Bash command on Linux/macOS/non-Windows, and a cmd.exe command
 | <a id="copy_file-out"></a>out |  Path of the output file, relative to this package.   |  none |
 | <a id="copy_file-is_executable"></a>is_executable |  A boolean. Whether to make the output file executable. When True, the rule's output can be executed using <code>bazel run</code> and can be in the srcs of binary and test rules that require executable sources. WARNING: If <code>allow_symlink</code> is True, <code>src</code> must also be executable.   |  <code>False</code> |
 | <a id="copy_file-allow_symlink"></a>allow_symlink |  A boolean. Whether to allow symlinking instead of copying. When False, the output is always a hard copy. When True, the output *can* be a symlink, but there is no guarantee that a symlink is created (i.e., at the time of writing, we don't create symlinks on Windows). Set this to True if you need fast copying and your tools can handle symlinks (which most UNIX tools can).   |  <code>False</code> |
-| <a id="copy_file-progress_message"></a>progress_message |  A custom action progress message.   |  <code>"Copying files"</code> |
 | <a id="copy_file-mnemonic"></a>mnemonic |  A custom action mnemonic.   |  <code>"CopyFile"</code> |
+| <a id="copy_file-progress_message"></a>progress_message |  A custom action progress message.   |  <code>"Copying files"</code> |
 | <a id="copy_file-kwargs"></a>kwargs |  further keyword arguments, e.g. <code>visibility</code>   |  none |
 
 

rules/private/copy_directory_private.bzl

@@ -123,7 +123,7 @@ _copy_directory = rule(
     },
 )
 
-def copy_directory(name, src, out, progress_message = "Copying directory %{input}", mnemonic = "CopyDirectory", **kwargs):
+def copy_directory(name, src, out, mnemonic = "CopyDirectory", progress_message = "Copying directory %{input}", **kwargs):
     """Copies a directory to another location.
 
     This rule uses a Bash command on Linux/macOS/non-Windows, and a cmd.exe command on Windows (no Bash is required).

rules/private/copy_file_private.bzl

@@ -106,7 +106,7 @@ _copy_xfile = rule(
     attrs = _ATTRS,
 )
 
-def copy_file(name, src, out, is_executable = False, allow_symlink = False, progress_message = "Copying files", mnemonic = "CopyFile", **kwargs):
+def copy_file(name, src, out, is_executable = False, allow_symlink = False, mnemonic = "CopyFile", progress_message = "Copying files", **kwargs):
     """Copies a file to another location.
 
     `native.genrule()` is sometimes used to copy files (often wishing to rename them). The 'copy_file' rule does this with a simpler interface than genrule.