summary refs log tree commit diff
path: root/gpu_renderer/src
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-08 15:57:49 -0800
committerchrome-bot <chrome-bot@chromium.org>2019-03-13 21:05:03 -0700
commitfe3ef7d99892fad804cbc9de8801033fd483f337 (patch)
treeb07b227d98466d14e61660d144e85109bc632abd /gpu_renderer/src
parentfa132759424c5019dc9086e53d8db14500fee64f (diff)
downloadcrosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.gz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.bz2
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.lz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.xz
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.tar.zst
crosvm-fe3ef7d99892fad804cbc9de8801033fd483f337.zip
edition: Update absolute paths to 2018 style
This is an easy step toward adopting 2018 edition eventually, and will
make any future CL that sets `edition = "2018"` this much smaller.

The module system changes in Rust 2018 are described here:

https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html

Generated by running:

    cargo fix --edition --all

in each workspace, followed by bin/fmt.

TEST=cargo check
TEST=cargo check --all-features
TEST=cargo check --target aarch64-unknown-linux-gnu

Change-Id: I000ab5e69d69aa222c272fae899464bbaf65f6d8
Reviewed-on: https://chromium-review.googlesource.com/1513054
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: David Tolnay <dtolnay@chromium.org>
Diffstat (limited to 'gpu_renderer/src')
-rw-r--r--gpu_renderer/src/command_buffer.rs5
-rw-r--r--gpu_renderer/src/lib.rs19
-rw-r--r--gpu_renderer/src/pipe_format_fourcc.rs2
3 files changed, 13 insertions, 13 deletions
diff --git a/gpu_renderer/src/command_buffer.rs b/gpu_renderer/src/command_buffer.rs
index 26ac656..1f5b98a 100644
--- a/gpu_renderer/src/command_buffer.rs
+++ b/gpu_renderer/src/command_buffer.rs
@@ -6,9 +6,8 @@ use std::mem::size_of;
 use std::os::raw::c_void;
 use std::slice::{from_raw_parts, from_raw_parts_mut};
 
-use generated::virgl_protocol::*;
-
-use Resource;
+use crate::generated::virgl_protocol::*;
+use crate::Resource;
 
 /// Helper struct for making a virgl command buffer.
 #[derive(Default)]
diff --git a/gpu_renderer/src/lib.rs b/gpu_renderer/src/lib.rs
index 81c99db..1852f0a 100644
--- a/gpu_renderer/src/lib.rs
+++ b/gpu_renderer/src/lib.rs
@@ -29,21 +29,22 @@ use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
 use data_model::{VolatileMemory, VolatileSlice};
 use sys_util::{GuestAddress, GuestMemory};
 
-pub use command_buffer::CommandBufferBuilder;
-use generated::epoxy_egl::{
+use crate::generated::epoxy_egl::{
     EGLAttrib, EGLBoolean, EGLClientBuffer, EGLConfig, EGLContext, EGLDisplay, EGLImageKHR,
     EGLNativeDisplayType, EGLSurface, EGLenum, EGLint, EGLuint64KHR, EGLDEBUGPROCKHR,
     EGL_CONTEXT_CLIENT_VERSION, EGL_DMA_BUF_PLANE0_FD_EXT, EGL_DMA_BUF_PLANE0_OFFSET_EXT,
     EGL_DMA_BUF_PLANE0_PITCH_EXT, EGL_GL_TEXTURE_2D_KHR, EGL_HEIGHT, EGL_LINUX_DMA_BUF_EXT,
     EGL_LINUX_DRM_FOURCC_EXT, EGL_NONE, EGL_OPENGL_ES_API, EGL_SURFACE_TYPE, EGL_WIDTH,
 };
-use generated::p_defines::{PIPE_BIND_SAMPLER_VIEW, PIPE_TEXTURE_1D, PIPE_TEXTURE_2D};
-use generated::p_format::PIPE_FORMAT_B8G8R8X8_UNORM;
-use generated::virglrenderer::*;
-pub use generated::virglrenderer::{
+use crate::generated::p_defines::{PIPE_BIND_SAMPLER_VIEW, PIPE_TEXTURE_1D, PIPE_TEXTURE_2D};
+use crate::generated::p_format::PIPE_FORMAT_B8G8R8X8_UNORM;
+use crate::generated::virglrenderer::*;
+
+pub use crate::command_buffer::CommandBufferBuilder;
+pub use crate::generated::virglrenderer::{
     virgl_renderer_resource_create_args, virgl_renderer_resource_info,
 };
-pub use pipe_format_fourcc::pipe_format_fourcc as format_fourcc;
+pub use crate::pipe_format_fourcc::pipe_format_fourcc as format_fourcc;
 
 /// Arguments used in `Renderer::create_resource`..
 pub type ResourceCreateArgs = virgl_renderer_resource_create_args;
@@ -254,7 +255,7 @@ struct EGLFunctions(Rc<EGLFunctionsInner>);
 
 impl EGLFunctions {
     fn new() -> Result<EGLFunctions> {
-        use generated::epoxy_egl::{
+        use crate::generated::epoxy_egl::{
             epoxy_eglBindAPI, epoxy_eglChooseConfig, epoxy_eglCreateContext,
             epoxy_eglCreateImageKHR, epoxy_eglDebugMessageControlKHR, epoxy_eglDestroyImageKHR,
             epoxy_eglExportDMABUFImageQueryMESA, epoxy_eglExportDRMImageMESA,
@@ -966,7 +967,7 @@ impl Drop for Resource {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use generated::p_defines::PIPE_CLEAR_COLOR0;
+    use crate::generated::p_defines::PIPE_CLEAR_COLOR0;
 
     #[test]
     #[ignore]
diff --git a/gpu_renderer/src/pipe_format_fourcc.rs b/gpu_renderer/src/pipe_format_fourcc.rs
index 1b04775..5a93167 100644
--- a/gpu_renderer/src/pipe_format_fourcc.rs
+++ b/gpu_renderer/src/pipe_format_fourcc.rs
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use generated::p_format;
+use crate::generated::p_format;
 
 macro_rules! fourcc {
     ($a:expr, $b:expr, $c:expr, $d:expr) => {