From 565bf7514506110a53e37ca686a222527e1ed4e4 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 13 Mar 2018 10:00:19 +0100
Subject: Remove Rust MP4 parser

Part 1 for #58
---
 toolkit/library/rust/Cargo.lock        | 15 ---------------
 toolkit/library/rust/shared/Cargo.toml |  1 -
 toolkit/library/rust/shared/lib.rs     |  1 -
 3 files changed, 17 deletions(-)

(limited to 'toolkit/library/rust')

diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index 7c1d54ddc..ca04ab281 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -14,7 +14,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "gkrust-shared"
 version = "0.1.0"
 dependencies = [
- "mp4parse_capi 0.6.0",
  "nsstring 0.1.0",
  "rust_url_capi 0.0.1",
 ]
@@ -39,20 +38,6 @@ name = "matches"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "mp4parse"
-version = "0.6.0"
-dependencies = [
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mp4parse_capi"
-version = "0.6.0"
-dependencies = [
- "mp4parse 0.6.0",
-]
-
 [[package]]
 name = "nsstring"
 version = "0.1.0"
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index 07e735755..fe05ecaaf 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -6,7 +6,6 @@ license = "MPL-2.0"
 description = "Shared Rust code for libxul"
 
 [dependencies]
-mp4parse_capi = { path = "../../../../media/libstagefright/binding/mp4parse_capi" }
 nsstring = { path = "../../../../xpcom/rust/nsstring" }
 rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" }
 
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
index 838b9f379..ddaebca51 100644
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -2,6 +2,5 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-extern crate mp4parse_capi;
 extern crate nsstring;
 extern crate rust_url_capi;
-- 
cgit v1.2.3


From a1f143420203395d9a7f347bb232ca86daa40f2b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 13 Mar 2018 10:21:40 +0100
Subject: Remove Rust URL parser CAPI

Part 2 for #58
---
 toolkit/library/rust/Cargo.lock        | 9 ---------
 toolkit/library/rust/shared/Cargo.toml | 1 -
 toolkit/library/rust/shared/lib.rs     | 1 -
 3 files changed, 11 deletions(-)

(limited to 'toolkit/library/rust')

diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index ca04ab281..5ab22840a 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -15,7 +15,6 @@ name = "gkrust-shared"
 version = "0.1.0"
 dependencies = [
  "nsstring 0.1.0",
- "rust_url_capi 0.0.1",
 ]
 
 [[package]]
@@ -42,14 +41,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "nsstring"
 version = "0.1.0"
 
-[[package]]
-name = "rust_url_capi"
-version = "0.0.1"
-dependencies = [
- "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "unicode-bidi"
 version = "0.2.3"
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index fe05ecaaf..4b94a1c94 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -7,7 +7,6 @@ description = "Shared Rust code for libxul"
 
 [dependencies]
 nsstring = { path = "../../../../xpcom/rust/nsstring" }
-rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" }
 
 [lib]
 path = "lib.rs"
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
index ddaebca51..f6d7a5ae0 100644
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -3,4 +3,3 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 extern crate nsstring;
-extern crate rust_url_capi;
-- 
cgit v1.2.3


From 7c68c5a22cfe8f83322836a1a6a76a8ae0415ec1 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 13 Mar 2018 12:15:45 +0100
Subject: Remove cargo nsstring component

Part 3 for #58
---
 toolkit/library/rust/Cargo.lock        | 4 ----
 toolkit/library/rust/shared/Cargo.toml | 3 ---
 toolkit/library/rust/shared/lib.rs     | 1 -
 3 files changed, 8 deletions(-)

(limited to 'toolkit/library/rust')

diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index 5ab22840a..ae9d84eed 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -37,10 +37,6 @@ name = "matches"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "nsstring"
-version = "0.1.0"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.2.3"
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index 4b94a1c94..d4b57dd10 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -5,9 +5,6 @@ authors = ["nobody@mozilla.org"]
 license = "MPL-2.0"
 description = "Shared Rust code for libxul"
 
-[dependencies]
-nsstring = { path = "../../../../xpcom/rust/nsstring" }
-
 [lib]
 path = "lib.rs"
 test = false
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
index f6d7a5ae0..6fbb80a0b 100644
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -2,4 +2,3 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-extern crate nsstring;
-- 
cgit v1.2.3


From 38d185280e2cad4ed6673bb38f707f54dad4ded7 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Tue, 13 Mar 2018 13:38:57 +0100
Subject: Remove Rust from the tree.

Part 4 for #58
---
 toolkit/library/rust/Cargo.lock        | 69 ----------------------------------
 toolkit/library/rust/Cargo.toml        | 37 ------------------
 toolkit/library/rust/lib.rs            |  9 -----
 toolkit/library/rust/moz.build         |  7 ----
 toolkit/library/rust/shared/Cargo.toml | 15 --------
 toolkit/library/rust/shared/lib.rs     |  4 --
 6 files changed, 141 deletions(-)
 delete mode 100644 toolkit/library/rust/Cargo.lock
 delete mode 100644 toolkit/library/rust/Cargo.toml
 delete mode 100644 toolkit/library/rust/lib.rs
 delete mode 100644 toolkit/library/rust/moz.build
 delete mode 100644 toolkit/library/rust/shared/Cargo.toml
 delete mode 100644 toolkit/library/rust/shared/lib.rs

(limited to 'toolkit/library/rust')

diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
deleted file mode 100644
index ae9d84eed..000000000
--- a/toolkit/library/rust/Cargo.lock
+++ /dev/null
@@ -1,69 +0,0 @@
-[root]
-name = "gkrust"
-version = "0.1.0"
-dependencies = [
- "gkrust-shared 0.1.0",
-]
-
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "gkrust-shared"
-version = "0.1.0"
-dependencies = [
- "nsstring 0.1.0",
-]
-
-[[package]]
-name = "idna"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "matches 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "matches"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "matches 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "url"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-"checksum idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11"
-"checksum libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "408014cace30ee0f767b1c4517980646a573ec61a57957aeeabcac8ac0a02e8d"
-"checksum matches 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc3ad8109fa4b522f9b0cd81440422781f564aaf8c195de6b9d6642177ad0dd"
-"checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f"
-"checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172"
-"checksum url 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8527c62d9869a08325c38272b3f85668df22a65890c61a639d233dc0ed0b23a2"
diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
deleted file mode 100644
index c41fd43c6..000000000
--- a/toolkit/library/rust/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "gkrust"
-version = "0.1.0"
-authors = ["nobody@mozilla.org"]
-license = "MPL-2.0"
-description = "Rust code for libxul"
-
-[dependencies]
-gkrust-shared = { path = "shared" }
-
-[lib]
-path = "lib.rs"
-crate-type = ["staticlib"]
-test = false
-doctest = false
-bench = false
-doc = false
-plugin = false
-harness = false
-
-# Explicitly specify what our profiles use.
-[profile.dev]
-opt-level = 1
-debug = true
-rpath = false
-lto = false
-debug-assertions = true
-codegen-units = 1
-panic = "abort"
-
-[profile.release]
-opt-level = 2
-debug = true
-rpath = false
-lto = true
-debug-assertions = false
-panic = "abort"
diff --git a/toolkit/library/rust/lib.rs b/toolkit/library/rust/lib.rs
deleted file mode 100644
index 815413a5d..000000000
--- a/toolkit/library/rust/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// You should not be adding code to this crate; you will almost certainly
-// get link errors when linking libxul-gtest.  Add any |extern crate|
-// declarations or similar to the gkrust-shared crate in
-// toolkit/library/rust/shared/lib.rs.
-extern crate gkrust_shared;
diff --git a/toolkit/library/rust/moz.build b/toolkit/library/rust/moz.build
deleted file mode 100644
index 43ec263d9..000000000
--- a/toolkit/library/rust/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-RustLibrary('gkrust')
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
deleted file mode 100644
index d4b57dd10..000000000
--- a/toolkit/library/rust/shared/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "gkrust-shared"
-version = "0.1.0"
-authors = ["nobody@mozilla.org"]
-license = "MPL-2.0"
-description = "Shared Rust code for libxul"
-
-[lib]
-path = "lib.rs"
-test = false
-doctest = false
-bench = false
-doc = false
-plugin = false
-harness = false
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
deleted file mode 100644
index 6fbb80a0b..000000000
--- a/toolkit/library/rust/shared/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-- 
cgit v1.2.3