From 4b74f59c2a09c84d1497a09847d7bcd77fd89601 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 12 Apr 2019 19:39:20 -0700 Subject: [PATCH] clippy: Resolve string_lit_as_bytes TEST=bin/clippy Change-Id: Icf56040c26cd67560358d360353d276146a63eca Reviewed-on: https://chromium-review.googlesource.com/1566749 Commit-Ready: David Tolnay Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Daniel Verkamp --- bin/clippy | 1 - devices/src/virtio/input/defaults.rs | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bin/clippy b/bin/clippy index ec36b9aba7..2ced4adfed 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 347f3a72f6..4bf1ba270c 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),