From 99638d3f435759ff0f335c8dcd7943942025af57 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@yucca.local>
Date: Wed, 5 Nov 2014 18:36:22 -0700
Subject: [PATCH] Fix warnings for latest Rust

---
 src/azure.rs    |  4 +++-
 src/azure_hl.rs | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/azure.rs b/src/azure.rs
index a5ce168..bb39930 100644
--- a/src/azure.rs
+++ b/src/azure.rs
@@ -4,7 +4,9 @@
 
 /* automatically generated by rust-bindgen */
 
-#![allow(non_uppercase_statics, non_camel_case_types, non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
 
 use libc::*;
 
diff --git a/src/azure_hl.rs b/src/azure_hl.rs
index 23e4571..1f956d4 100644
--- a/src/azure_hl.rs
+++ b/src/azure_hl.rs
@@ -39,7 +39,7 @@ use geom::matrix2d::Matrix2D;
 use geom::point::Point2D;
 use geom::rect::Rect;
 use geom::size::Size2D;
-use layers::platform::surface::{NativeGraphicsMetadata, NativePaintingGraphicsContext};
+use layers::platform::surface::NativePaintingGraphicsContext;
 use libc::types::common::c99::{uint8_t, uint16_t};
 use libc::size_t;
 use std::mem;
@@ -161,6 +161,7 @@ pub enum CompositionOp {
     LuminosityOp,
 }
 
+#[allow(non_snake_case)]
 pub struct StrokeOptions {
     pub line_width: AzFloat,
     pub miter_limit: AzFloat,
@@ -372,7 +373,7 @@ impl DrawTarget {
         assert!((data.len() - offset) as i32 >= stride * size.height);
         let azure_draw_target = unsafe {
             AzCreateDrawTargetForData(backend.as_azure_backend_type(),
-                                      data.get_mut(offset),
+                                      &mut data[offset],
                                       &mut size.as_azure_int_size(),
                                       stride,
                                       format.as_azure_surface_format())
@@ -595,14 +596,14 @@ impl DrawTarget {
                        mut glyphbuf: struct__AzGlyphBuffer,
                        azure_pattern: AzColorPatternRef,
                        mut options: struct__AzDrawOptions,
-                       renderingOptions: AzGlyphRenderingOptionsRef) {
+                       rendering_options: AzGlyphRenderingOptionsRef) {
         unsafe {
             AzDrawTargetFillGlyphs(self.azure_draw_target,
                     azfontref,
                     &mut glyphbuf,
                     azure_pattern,
                     &mut options,
-                    renderingOptions);
+                    rendering_options);
         }
     }
 
@@ -701,11 +702,13 @@ impl ExtendMode {
 }
 
 // FIXME Rust #8753 no fixed stack segment for default methods
+#[allow(non_snake_case)]
 unsafe fn AzSourceSurfaceGetSize_(aSurface: AzSourceSurfaceRef) -> AzIntSize {
     AzSourceSurfaceGetSize(aSurface)
 }
 
 // FIXME Rust #8753 no fixed stack segment for default methods
+#[allow(non_snake_case)]
 unsafe fn AzSourceSurfaceGetFormat_(aSurface: AzSourceSurfaceRef) -> AzSurfaceFormat {
     AzSourceSurfaceGetFormat(aSurface)
 }