Auto merge of #9258 - mbrubeck:stb-up, r=jdm

Upgrade to latest stb_image 0.2.1 from crates.io

Includes servo/rust-stb-image#84.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9258)
<!-- Reviewable:end -->

5 files changed, 15 insertions, 19 deletions

diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 7da3d281771..13fee9e078b 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -13,9 +13,6 @@ path = "../util"
 [dependencies.msg]
 path = "../msg"
 
-[dependencies.stb_image]
-git = "https://github.com/servo/rust-stb-image"
-
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
@@ -29,5 +26,6 @@ hyper = { version = "0.7", features = [ "serde-serialization" ] }
 image = "0.5.0"
 serde = "0.6"
 serde_macros = "0.6"
+stb_image = "0.2"
 url = "0.5.2"
 websocket = "0.14.0"
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index a7a5c99a7d0..62415749c64 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1202,7 +1202,7 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "stb_image 0.2.0 (git+https://github.com/servo/rust-stb-image)",
+ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1747,8 +1747,8 @@ dependencies = [
 
 [[package]]
 name = "stb_image"
-version = "0.2.0"
-source = "git+https://github.com/servo/rust-stb-image#bf1edc24753962e474cae3a2ad376a6d423cd91d"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 71f5d560bf9..d060c2111e3 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -25,7 +25,7 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "servo 0.0.1",
- "stb_image 0.2.0 (git+https://github.com/servo/rust-stb-image)",
+ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1142,7 +1142,7 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "stb_image 0.2.0 (git+https://github.com/servo/rust-stb-image)",
+ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1697,8 +1697,8 @@ dependencies = [
 
 [[package]]
 name = "stb_image"
-version = "0.2.0"
-source = "git+https://github.com/servo/rust-stb-image#bf1edc24753962e474cae3a2ad376a6d423cd91d"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index aea6e20498c..21130f1cef2 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -9,11 +9,12 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-log = "0.3"
-url = "0.5.2"
-libc = "0.2"
 euclid = {version = "0.4", features = ["plugins"]}
 gleam = "0.2"
+libc = "0.2"
+log = "0.3"
+stb_image = "0.2"
+url = "0.5.2"
 
 [dependencies.servo]
 path = "../../components/servo"
@@ -62,9 +63,6 @@ git = "https://github.com/servo/rust-mozjs"
 git = "https://github.com/servo/rust-layers"
 features = ["plugins"]
 
-[dependencies.stb_image]
-git = "https://github.com/servo/rust-stb-image"
-
 [target.x86_64-apple-darwin.dependencies]
 objc = "0.1"
 cocoa = "0.1"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 58f283bf483..fe8da40f430 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -1110,7 +1110,7 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "stb_image 0.2.0 (git+https://github.com/servo/rust-stb-image)",
+ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1663,8 +1663,8 @@ dependencies = [
 
 [[package]]
 name = "stb_image"
-version = "0.2.0"
-source = "git+https://github.com/servo/rust-stb-image#bf1edc24753962e474cae3a2ad376a6d423cd91d"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]