Skip to content

Commit 0d699a2

Browse files
author
bors-servo
committed
Auto merge of #8241 - Manishearth:euclid_up, r=mbrubeck
Update euclid to 0.3 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8241) <!-- Reviewable:end -->
2 parents 3efa749 + 184b2ba commit 0d699a2

File tree

27 files changed

+522
-260
lines changed

27 files changed

+522
-260
lines changed

‎components/canvas/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ path = "lib.rs"
99

1010
[dependencies.azure]
1111
git = "https://github.com/servo/rust-azure"
12+
features = ["plugins"]
1213

1314
[dependencies.layers]
1415
git = "https://github.com/servo/rust-layers"
16+
features = ["plugins"]
1517

1618
[dependencies.canvas_traits]
1719
path = "../canvas_traits"
@@ -40,4 +42,4 @@ features = [ "serde-serialization" ]
4042
log = "0.3"
4143
num = "0.1.24"
4244
gleam = "0.1"
43-
euclid = "0.2"
45+
euclid = {version = "0.3", features = ["plugins"]}

‎components/canvas_traits/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ path = "../gfx_traits"
1212

1313
[dependencies.azure]
1414
git = "https://github.com/servo/rust-azure"
15+
features = ["plugins"]
1516

1617
[dependencies.layers]
1718
git = "https://github.com/servo/rust-layers"
19+
features = ["plugins"]
1820

1921
[dependencies.offscreen_gl_context]
2022
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
@@ -37,6 +39,6 @@ path = "../plugins"
3739
path = "../util"
3840

3941
[dependencies]
40-
euclid = "0.2"
41-
serde_macros = "0.5"
42+
euclid = {version = "0.3", features = ["plugins"]}
43+
serde_macros = "0.6"
4244

‎components/compositing/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ path = "../plugins"
4848

4949
[dependencies.azure]
5050
git = "https://github.com/servo/rust-azure"
51+
features = ["plugins"]
5152

5253
[dependencies.layers]
5354
git = "https://github.com/servo/rust-layers"
55+
features = ["plugins"]
5456

5557
[dependencies.clipboard]
5658
git = "https://github.com/aweinstock314/rust-clipboard"
@@ -67,13 +69,13 @@ version = "0.2"
6769
features = [ "serde_serialization" ]
6870

6971
[dependencies]
70-
app_units = "0.1"
72+
app_units = {version = "0.1", features = ["plugins"]}
7173
image = "0.4.0"
7274
log = "0.3"
7375
num = "0.1.24"
7476
time = "0.1.17"
7577
gleam = "0.1"
76-
euclid = "0.2"
78+
euclid = {version = "0.3", features = ["plugins"]}
7779

7880
[target.x86_64-apple-darwin.dependencies]
7981
core-graphics = "0.1"

‎components/devtools/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ log = "0.3"
3535
time = "0.1"
3636
rustc-serialize = "0.3"
3737
serde = "0.6"
38-
serde_macros = "0.5"
38+
serde_macros = "0.6"
3939

‎components/devtools_traits/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ time = "0.1"
3232
rustc-serialize = "0.3"
3333
bitflags = "0.3"
3434
serde = "0.6"
35-
serde_macros = "0.5"
35+
serde_macros = "0.6"
3636

‎components/gfx/Cargo.toml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name = "gfx"
99
path = "lib.rs"
1010

1111
[dependencies]
12-
app_units = "0.1"
12+
app_units = {version = "0.1", features = ["plugins"]}
1313
bitflags = "0.3"
14-
euclid = "0.2"
14+
euclid = {version = "0.3", features = ["plugins"]}
1515
fnv = "1.0"
1616
harfbuzz-sys = "0.1"
1717
lazy_static = "0.1"
@@ -20,7 +20,7 @@ log = "0.3"
2020
rand = "0.3"
2121
rustc-serialize = "0.3"
2222
serde = "0.6"
23-
serde_macros = "0.5"
23+
serde_macros = "0.6"
2424
smallvec = "0.1"
2525
string_cache = "0.1"
2626
time = "0.1.12"
@@ -52,9 +52,11 @@ path = "../style"
5252

5353
[dependencies.azure]
5454
git = "https://github.com/servo/rust-azure"
55+
features = ["plugins"]
5556

5657
[dependencies.layers]
5758
git = "https://github.com/servo/rust-layers"
59+
features = ["plugins"]
5860

5961
[dependencies.skia]
6062
git = "https://github.com/servo/skia"

‎components/gfx_traits/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ path = "lib.rs"
99

1010
[dependencies.azure]
1111
git = "https://github.com/servo/rust-azure"
12+
features = ["plugins"]

‎components/layout/Cargo.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ path = "lib.rs"
99

1010
[dependencies.azure]
1111
git = "https://github.com/servo/rust-azure"
12+
features = ["plugins"]
1213

1314
[dependencies.canvas]
1415
path = "../canvas"
@@ -67,7 +68,7 @@ version = "0.2"
6768
features = [ "serde_serialization" ]
6869

6970
[dependencies]
70-
app_units = "0.1"
71+
app_units = {version = "0.1", features = ["plugins"]}
7172
log = "0.3"
7273
encoding = "0.2"
7374
fnv = "1.0"
@@ -77,9 +78,9 @@ libc = "0.1"
7778
smallvec = "0.1"
7879
string_cache = "0.1"
7980
string_cache_plugin = "0.1"
80-
euclid = "0.2"
81+
euclid = {version = "0.3", features = ["plugins"]}
8182
serde = "0.6"
82-
serde_macros = "0.5"
83+
serde_macros = "0.6"
8384
serde_json = "0.5"
8485
unicode-bidi = "0.2"
8586
unicode-script = { version = "0.1", features = ["harfbuzz"] }

‎components/layout_traits/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ version = "0.2"
3333
features = [ "serde_serialization" ]
3434

3535
[dependencies]
36-
euclid = "0.2"
36+
euclid = {version = "0.3", features = ["plugins"]}
3737
serde = "0.6"
38-
serde_macros = "0.5"
38+
serde_macros = "0.6"
3939

‎components/msg/Cargo.toml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ path = "../style_traits"
1818

1919
[dependencies.azure]
2020
git = "https://github.com/servo/rust-azure"
21+
features = ["plugins"]
2122

2223
[dependencies.layers]
2324
git = "https://github.com/servo/rust-layers"
25+
features = ["plugins"]
2426

2527
[dependencies.hyper]
2628
version = "0.6"
@@ -41,12 +43,12 @@ features = ["texture_surface"]
4143
path = "../plugins"
4244

4345
[dependencies]
44-
app_units = "0.1"
46+
app_units = {version = "0.1", features = ["plugins"]}
4547
bitflags = "0.3"
4648
rustc-serialize = "0.3.4"
47-
euclid = "0.2"
49+
euclid = {version = "0.3", features = ["plugins"]}
4850
serde = "0.6"
49-
serde_macros = "0.5"
51+
serde_macros = "0.6"
5052

5153
[target.x86_64-apple-darwin.dependencies]
5254
core-foundation = "0.1"

0 commit comments

Comments
 (0)