Skip to content
This repository was archived by the owner on Jun 8, 2020. It is now read-only.

Commit 0aaf650

Browse files
author
bors-servo
authored
Auto merge of #138 - nical:euclid-bump, r=emilio
Bump euclid to 0.14. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/138) <!-- Reviewable:end -->
2 parents 172ac44 + c35e122 commit 0aaf650

11 files changed

+12
-12
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "servo-skia"
4-
version = "0.30000004.3"
4+
version = "0.30000005.3"
55
authors = ["The Skia Project Developers and The Servo Project Developers"]
66
description = "2D graphic library for drawing Text, Geometries, and Images"
77
license = "BSD-3-Clause"
@@ -28,7 +28,7 @@ name = "skia"
2828
cmake = "0.1"
2929

3030
[dependencies]
31-
euclid = ">= 0.11, < 0.14"
31+
euclid = "0.14"
3232
gleam = "0.4"
3333
libc = "0.2"
3434
expat-sys = "2.1.1"

src/gl_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
use skia;
99

10-
use euclid::size::Size2D;
10+
use euclid::Size2D;
1111
use gleam::gl;
1212
use std::ptr;
1313
use std::rc::Rc;

src/gl_context_android.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* found in the LICENSE file.
66
*/
77

8-
use euclid::size::Size2D;
8+
use euclid::Size2D;
99
use egl::egl;
1010
use gleam::gl;
1111
use std::ptr;

src/gl_context_cgl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use gl_rasterization_context;
99
use skia;
1010

11-
use euclid::size::Size2D;
11+
use euclid::Size2D;
1212
use cgl;
1313
use gleam::gl;
1414
use std::ptr;

src/gl_context_glx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use gl_rasterization_context;
99
use skia;
1010

11-
use euclid::size::Size2D;
11+
use euclid::Size2D;
1212
use glx;
1313
use std::ptr;
1414
use std::rc::Rc;

src/gl_context_wgl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extern crate glutin;
1010
use gl_rasterization_context;
1111
use skia;
1212

13-
use euclid::size::Size2D;
13+
use euclid::Size2D;
1414
use gleam::gl;
1515
use std::ptr;
1616
use std::rc::Rc;

src/gl_rasterization_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
use skia;
99

10-
use euclid::size::Size2D;
10+
use euclid::Size2D;
1111
use gleam::gl;
1212
use std::ffi::CString;
1313

src/gl_rasterization_context_android.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use gl_context::GLContext;
99
use gl_rasterization_context;
1010

11-
use euclid::size::Size2D;
11+
use euclid::Size2D;
1212
use egl::egl;
1313
use egl::eglext;
1414
use gleam::gl;

src/gl_rasterization_context_cgl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use gl_context::GLContext;
99
use gl_rasterization_context;
1010

1111
use cgl;
12-
use euclid::size::Size2D;
12+
use euclid::Size2D;
1313
use gleam::gl;
1414
use io_surface;
1515
use libc;

src/gl_rasterization_context_glx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
use gl_context::GLContext;
99

10-
use euclid::size::Size2D;
10+
use euclid::Size2D;
1111
use gleam::gl;
1212
use std::ptr;
1313
use std::sync::Arc;

src/gl_rasterization_context_wgl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use gl_context::GLContext;
99
use gl_rasterization_context;
1010

11-
use euclid::size::Size2D;
11+
use euclid::Size2D;
1212
use gleam::gl;
1313
use std::sync::Arc;
1414

0 commit comments

Comments
 (0)