cargo: Sort all dependency lists in Cargo.toml

This may help reduce cases of conflicts between independent CLs each
appending a dependency at the bottom of the list, of which I hit two
today rebasing some of my open CLs.

TEST=cargo check --all-features

Change-Id: Ief10bb004cc7b44b107dc3841ce36c6b23632aed
Reviewed-on: https://chromium-review.googlesource.com/1557172
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>

16 files changed, 52 insertions, 53 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 7343025..4a6edc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,52 +13,52 @@ members = ["qcow_utils"]
 exclude = [
     "assertions",
     "data_model",
+    "rand_ish",
     "sync",
     "sys_util",
     "syscall_defines",
     "tempdir",
-    "rand_ish",
 ]
 
 [features]
-plugin = ["plugin_proto", "crosvm_plugin", "protobuf"]
 default-no-sandbox = []
-wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"]
 gpu = ["devices/gpu"]
-tpm = ["devices/tpm"]
 gpu-forward = ["render_node_forward"]
+plugin = ["plugin_proto", "crosvm_plugin", "protobuf"]
 sandboxed-libusb = ["devices/sandboxed-libusb", "vm_control/sandboxed-libusb"]
+tpm = ["devices/tpm"]
+wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"]
 
 [dependencies]
 arch = { path = "arch" }
 audio_streams = "*"
 bit_field = { path = "bit_field" }
+byteorder = "=1.1.0"
+crosvm_plugin = { path = "crosvm_plugin", optional = true }
+data_model = "*"
 devices = { path = "devices" }
 enumn = { path = "enumn" }
 gpu_buffer = { path = "gpu_buffer", optional = true }
 io_jail = { path = "io_jail" }
-kvm = { path = "kvm" }
-kvm_sys = { path = "kvm_sys" }
-msg_socket = { path = "msg_socket" }
-sys_util = "*"
 kernel_cmdline = { path = "kernel_cmdline" }
 kernel_loader = { path = "kernel_loader" }
+kvm = { path = "kvm" }
+kvm_sys = { path = "kvm_sys" }
 libc = "=0.2.44"
 libcras = "*"
-byteorder = "=1.1.0"
+msg_socket = { path = "msg_socket" }
 net_util = { path = "net_util" }
-vhost = { path = "vhost" }
-vm_control = { path = "vm_control" }
-data_model = "*"
-qcow = { path = "qcow" }
+p9 = { path = "p9" }
 plugin_proto = { path = "plugin_proto", optional = true }
-crosvm_plugin = { path = "crosvm_plugin", optional = true }
 protobuf = { version = "=1.4.3", optional = true }
-resources = { path = "resources" }
-p9 = { path = "p9" }
-sync = { path = "sync" }
+qcow = { path = "qcow" }
 rand_ish = { path = "rand_ish" }
 render_node_forward = { path = "render_node_forward", optional = true }
+resources = { path = "resources" }
+sync = { path = "sync" }
+sys_util = "*"
+vhost = { path = "vhost" }
+vm_control = { path = "vm_control" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86_64 = { path = "x86_64" }
diff --git a/aarch64/Cargo.toml b/aarch64/Cargo.toml
index 2105c1c..4d773a3 100644
--- a/aarch64/Cargo.toml
+++ b/aarch64/Cargo.toml
@@ -10,9 +10,9 @@ data_model = { path = "../data_model" }
 devices = { path = "../devices" }
 io_jail = { path = "../io_jail" }
 kernel_cmdline = { path = "../kernel_cmdline" }
-kvm_sys = { path = "../kvm_sys" }
 kvm = { path = "../kvm" }
-sys_util = { path = "../sys_util" }
+kvm_sys = { path = "../kvm_sys" }
+libc = "*"
 resources = { path = "../resources" }
 sync = { path = "../sync" }
-libc = "*"
+sys_util = { path = "../sys_util" }
diff --git a/arch/Cargo.toml b/arch/Cargo.toml
index d41021c..f562fca 100644
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
 byteorder = "*"
 devices = { path = "../devices" }
 io_jail = { path = "../io_jail" }
-kvm = { path = "../kvm" }
-sys_util = { path = "../sys_util" }
-resources = { path = "../resources" }
 kernel_cmdline = { path = "../kernel_cmdline" }
+kvm = { path = "../kvm" }
 libc = "*"
+resources = { path = "../resources" }
 sync = { path = "../sync" }
+sys_util = { path = "../sys_util" }
diff --git a/bit_field/bit_field_derive/Cargo.toml b/bit_field/bit_field_derive/Cargo.toml
index 2946ddb..df84a2a 100644
--- a/bit_field/bit_field_derive/Cargo.toml
+++ b/bit_field/bit_field_derive/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
-syn = "=0.15"
-quote = "=0.6"
 proc-macro2 = "=0.4"
+quote = "=0.6"
+syn = "=0.15"
 
 [lib]
 proc-macro = true
diff --git a/crosvm_plugin/Cargo.toml b/crosvm_plugin/Cargo.toml
index b3854bb..3fd767b 100644
--- a/crosvm_plugin/Cargo.toml
+++ b/crosvm_plugin/Cargo.toml
@@ -7,9 +7,9 @@ authors = ["The Chromium OS Authors"]
 crate-type = ["cdylib"]
 
 [dependencies]
-protobuf = "=1.4.3"
-plugin_proto = { path = "../plugin_proto" }
-sys_util = { path = "../sys_util" }
 kvm = { path = "../kvm" }
 kvm_sys = { path = "../kvm_sys" }
 libc = "*"
+plugin_proto = { path = "../plugin_proto" }
+protobuf = "=1.4.3"
+sys_util = { path = "../sys_util" }
diff --git a/devices/Cargo.toml b/devices/Cargo.toml
index 79d4367..c1ddad0 100644
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -4,23 +4,23 @@ version = "0.1.0"
 authors = ["The Chromium OS Authors"]
 
 [features]
-wl-dmabuf = []
 gpu = ["gpu_buffer", "gpu_display", "gpu_renderer"]
-tpm = ["tpm2"]
 sandboxed-libusb = ["usb_util/sandboxed-libusb"]
+tpm = ["tpm2"]
+wl-dmabuf = []
 
 [dependencies]
 audio_streams = "*"
 bit_field = { path = "../bit_field" }
 byteorder = "*"
 data_model = { path = "../data_model" }
+enumn = { path = "../enumn" }
 gpu_buffer = { path = "../gpu_buffer", optional = true }
 gpu_display = { path = "../gpu_display", optional = true }
 gpu_renderer = { path = "../gpu_renderer", optional = true }
-enumn = { path = "../enumn" }
+io_jail = { path = "../io_jail" }
 kvm = { path = "../kvm" }
 libc = "*"
-io_jail = { path = "../io_jail" }
 msg_on_socket_derive = { path = "../msg_socket/msg_on_socket_derive" }
 msg_socket = { path = "../msg_socket" }
 net_sys = { path = "../net_sys" }
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 152a0e4..5e63344 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2018"
 
 [dependencies]
 devices = { path = "../devices" }
-libc = "*"
 kernel_loader = { path = "../kernel_loader" }
+libc = "*"
 qcow = { path = "../qcow" }
 sys_util = { path = "../sys_util" }
 
diff --git a/kvm/Cargo.toml b/kvm/Cargo.toml
index 82a4df6..d12aa76 100644
--- a/kvm/Cargo.toml
+++ b/kvm/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
-libc = "*"
 kvm_sys = { path = "../kvm_sys" }
-sys_util = { path = "../sys_util" }
+libc = "*"
 msg_socket = { path = "../msg_socket" }
+sys_util = { path = "../sys_util" }
diff --git a/msg_socket/Cargo.toml b/msg_socket/Cargo.toml
index da95b85..dcfccfc 100644
--- a/msg_socket/Cargo.toml
+++ b/msg_socket/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
+data_model = { path = "../data_model" }
 msg_on_socket_derive = { path = "msg_on_socket_derive" }
 sys_util = { path = "../sys_util"  }
-data_model = { path = "../data_model" }
diff --git a/msg_socket/msg_on_socket_derive/Cargo.toml b/msg_socket/msg_on_socket_derive/Cargo.toml
index 08d581a..78e88de 100644
--- a/msg_socket/msg_on_socket_derive/Cargo.toml
+++ b/msg_socket/msg_on_socket_derive/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
-syn = "=0.15"
-quote = "=0.6"
 proc-macro2 = "=0.4"
+quote = "=0.6"
+syn = "=0.15"
 
 [lib]
 proc-macro = true
diff --git a/p9/wire_format_derive/Cargo.toml b/p9/wire_format_derive/Cargo.toml
index 93d708e..da6cc52 100644
--- a/p9/wire_format_derive/Cargo.toml
+++ b/p9/wire_format_derive/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
-syn = "=0.15"
-quote = "=0.6"
 proc-macro2 = "=0.4"
+quote = "=0.6"
+syn = "=0.15"
 
 [lib]
 proc-macro = true
diff --git a/resources/Cargo.toml b/resources/Cargo.toml
index 0226b65..d7458b9 100644
--- a/resources/Cargo.toml
+++ b/resources/Cargo.toml
@@ -10,5 +10,5 @@ wl-dmabuf = ["gpu_buffer"]
 [dependencies]
 gpu_buffer = { path = "../gpu_buffer", optional = true }
 libc = "*"
-sys_util = { path = "../sys_util" }
 msg_socket = { path = "../msg_socket" }
+sys_util = { path = "../sys_util" }
diff --git a/sys_util/Cargo.toml b/sys_util/Cargo.toml
index e9fcfd7..00e39fa 100644
--- a/sys_util/Cargo.toml
+++ b/sys_util/Cargo.toml
@@ -8,8 +8,8 @@ include = ["src/**/*", "Cargo.toml"]
 [dependencies]
 data_model = { path = "../data_model" } # provided by ebuild
 libc = "*"
-syscall_defines = { path = "../syscall_defines" } # provided by ebuild
 poll_token_derive = { version = "*", path = "poll_token_derive" }
 sync = { path = "../sync" } # provided by ebuild
+syscall_defines = { path = "../syscall_defines" } # provided by ebuild
 
 [workspace]
diff --git a/sys_util/poll_token_derive/Cargo.toml b/sys_util/poll_token_derive/Cargo.toml
index e29191f..45c4552 100644
--- a/sys_util/poll_token_derive/Cargo.toml
+++ b/sys_util/poll_token_derive/Cargo.toml
@@ -10,6 +10,6 @@ proc-macro = true
 path = "poll_token_derive.rs"
 
 [dependencies]
-syn = "0.15"
-quote = "0.6"
 proc-macro2 = "0.4"
+quote = "0.6"
+syn = "0.15"
diff --git a/vm_control/Cargo.toml b/vm_control/Cargo.toml
index 439ce2f..ba70fe2 100644
--- a/vm_control/Cargo.toml
+++ b/vm_control/Cargo.toml
@@ -12,6 +12,6 @@ byteorder = "*"
 data_model = { path = "../data_model" }
 kvm = { path = "../kvm" }
 libc = "*"
-sys_util = { path = "../sys_util" }
-resources = { path = "../resources" }
 msg_socket = { path = "../msg_socket" }
+resources = { path = "../resources" }
+sys_util = { path = "../sys_util" }
diff --git a/x86_64/Cargo.toml b/x86_64/Cargo.toml
index 62f9ed5..937702f 100644
--- a/x86_64/Cargo.toml
+++ b/x86_64/Cargo.toml
@@ -7,19 +7,18 @@ build = "build.rs"
 
 [dependencies]
 arch = { path = "../arch" }
+byteorder = "*"
 data_model = { path = "../data_model" }
 devices = { path = "../devices" }
 io_jail = { path = "../io_jail" }
-kvm_sys = { path = "../kvm_sys" }
-kvm = { path = "../kvm" }
-sync = { path = "../sync" }
-sys_util = { path = "../sys_util" }
-resources = { path = "../resources" }
 kernel_cmdline = { path = "../kernel_cmdline" }
 kernel_loader = { path = "../kernel_loader" }
+kvm = { path = "../kvm" }
+kvm_sys = { path = "../kvm_sys" }
 libc = "*"
-byteorder = "*"
+resources = { path = "../resources" }
+sync = { path = "../sync" }
+sys_util = { path = "../sys_util" }
 
 [build-dependencies]
 cc = "=1.0.25"
-