summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 19:39:20 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-17 17:22:54 -0700
commit4b74f59c2a09c84d1497a09847d7bcd77fd89601 (patch)
tree89c80485525aede79e5bedd05d2241229417a6bd
parent9f2929479b23765629978e16914ed773d9304046 (diff)
downloadcrosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar.gz
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar.bz2
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar.lz
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar.xz
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.tar.zst
crosvm-4b74f59c2a09c84d1497a09847d7bcd77fd89601.zip
clippy: Resolve string_lit_as_bytes
TEST=bin/clippy

Change-Id: Icf56040c26cd67560358d360353d276146a63eca
Reviewed-on: https://chromium-review.googlesource.com/1566749
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>
-rwxr-xr-xbin/clippy1
-rw-r--r--devices/src/virtio/input/defaults.rs16
2 files changed, 8 insertions, 9 deletions
diff --git a/bin/clippy b/bin/clippy
index ec36b9a..2ced4ad 100755
--- a/bin/clippy
+++ b/bin/clippy
@@ -16,7 +16,6 @@ SUPPRESS=(
     let_unit_value
     question_mark
     range_plus_one
-    string_lit_as_bytes
     toplevel_ref_arg
     unit_arg
     unneeded_field_pattern
diff --git a/devices/src/virtio/input/defaults.rs b/devices/src/virtio/input/defaults.rs
index 347f3a7..4bf1ba2 100644
--- a/devices/src/virtio/input/defaults.rs
+++ b/devices/src/virtio/input/defaults.rs
@@ -15,8 +15,8 @@ use super::VirtioInputConfig;
 pub fn new_trackpad_config(width: u32, height: u32) -> VirtioInputConfig {
     VirtioInputConfig::new(
         virtio_input_device_ids::new(0, 0, 0, 0),
-        "Crosvm Virtio Trackpad".as_bytes().to_vec(),
-        "virtio-trackpad".as_bytes().to_vec(),
+        b"Crosvm Virtio Trackpad".to_vec(),
+        b"virtio-trackpad".to_vec(),
         virtio_input_bitmap::new([0u8; 128]),
         default_trackpad_events(),
         default_trackpad_absinfo(width, height),
@@ -28,8 +28,8 @@ pub fn new_trackpad_config(width: u32, height: u32) -> VirtioInputConfig {
 pub fn new_mouse_config() -> VirtioInputConfig {
     VirtioInputConfig::new(
         virtio_input_device_ids::new(0, 0, 0, 0),
-        "Crosvm Virtio Mouse".as_bytes().to_vec(),
-        "virtio-mouse".as_bytes().to_vec(),
+        b"Crosvm Virtio Mouse".to_vec(),
+        b"virtio-mouse".to_vec(),
         virtio_input_bitmap::new([0u8; 128]),
         default_mouse_events(),
         BTreeMap::new(),
@@ -41,8 +41,8 @@ pub fn new_mouse_config() -> VirtioInputConfig {
 pub fn new_keyboard_config() -> VirtioInputConfig {
     VirtioInputConfig::new(
         virtio_input_device_ids::new(0, 0, 0, 0),
-        "Crosvm Virtio Keyboard".as_bytes().to_vec(),
-        "virtio-keyboard".as_bytes().to_vec(),
+        b"Crosvm Virtio Keyboard".to_vec(),
+        b"virtio-keyboard".to_vec(),
         virtio_input_bitmap::new([0u8; 128]),
         default_keyboard_events(),
         BTreeMap::new(),
@@ -54,8 +54,8 @@ pub fn new_keyboard_config() -> VirtioInputConfig {
 pub fn new_single_touch_config(width: u32, height: u32) -> VirtioInputConfig {
     VirtioInputConfig::new(
         virtio_input_device_ids::new(0, 0, 0, 0),
-        "Crosvm Virtio Touchscreen".as_bytes().to_vec(),
-        "virtio-touchscreen".as_bytes().to_vec(),
+        b"Crosvm Virtio Touchscreen".to_vec(),
+        b"virtio-touchscreen".to_vec(),
         virtio_input_bitmap::from_bits(&[INPUT_PROP_DIRECT]),
         default_touchscreen_events(),
         default_touchscreen_absinfo(width, height),