diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-03-13 14:55:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 14:55:45 +0100 |
commit | 5462c415744a64899dcd344dee42075f9154741b (patch) | |
tree | bbbb7df9a9f18c5fd3caf406d7f5bc9e13168d1f /toolkit | |
parent | 90e68c3e3f4bb2f1a427a01586981e62bf74b898 (diff) | |
parent | 38d185280e2cad4ed6673bb38f707f54dad4ded7 (diff) | |
download | UXP-5462c415744a64899dcd344dee42075f9154741b.tar UXP-5462c415744a64899dcd344dee42075f9154741b.tar.gz UXP-5462c415744a64899dcd344dee42075f9154741b.tar.lz UXP-5462c415744a64899dcd344dee42075f9154741b.tar.xz UXP-5462c415744a64899dcd344dee42075f9154741b.zip |
Merge pull request #59 from MoonchildProductions/Evapo-Rust
Remove all rust components and libs.
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/components/telemetry/Histograms.json | 33 | ||||
-rw-r--r-- | toolkit/library/gtest/moz.build | 5 | ||||
-rw-r--r-- | toolkit/library/gtest/rust/Cargo.lock | 110 | ||||
-rw-r--r-- | toolkit/library/gtest/rust/Cargo.toml | 44 | ||||
-rw-r--r-- | toolkit/library/gtest/rust/lib.rs | 7 | ||||
-rw-r--r-- | toolkit/library/gtest/rust/moz.build | 7 | ||||
-rw-r--r-- | toolkit/library/moz.build | 6 | ||||
-rw-r--r-- | toolkit/library/rust/Cargo.lock | 97 | ||||
-rw-r--r-- | toolkit/library/rust/Cargo.toml | 37 | ||||
-rw-r--r-- | toolkit/library/rust/lib.rs | 9 | ||||
-rw-r--r-- | toolkit/library/rust/moz.build | 7 | ||||
-rw-r--r-- | toolkit/library/rust/shared/Cargo.toml | 20 | ||||
-rw-r--r-- | toolkit/library/rust/shared/lib.rs | 7 | ||||
-rw-r--r-- | toolkit/toolkit.mozbuild | 6 |
14 files changed, 0 insertions, 395 deletions
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 45ad662c7..ade308cfa 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -6926,39 +6926,6 @@ "n_buckets": 1000, "description": "The time (in milliseconds) that it took to display a selected source to the user." }, - "MEDIA_RUST_MP4PARSE_SUCCESS": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1220885], - "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_ERROR_CODE": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 32, - "bug_numbers": [1238420], - "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1231169], - "description": "Whether rust and stagefight mp4 parser audio track results match.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1231169], - "description": "Whether rust and stagefight mp4 parser video track results match.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, "MEDIA_WMF_DECODE_ERROR": { "expires_in_version": "55", "kind": "enumerated", diff --git a/toolkit/library/gtest/moz.build b/toolkit/library/gtest/moz.build index c684f48e4..a5fb53fe1 100644 --- a/toolkit/library/gtest/moz.build +++ b/toolkit/library/gtest/moz.build @@ -20,11 +20,6 @@ USE_LIBS += [ # before StaticXULComponentStart. Libxul('xul-gtest-real') -if CONFIG['MOZ_RUST']: - USE_LIBS += [ - 'gkrust-gtest', - ] - DIRS += [ 'static', ] diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock deleted file mode 100644 index e1f7ed14e..000000000 --- a/toolkit/library/gtest/rust/Cargo.lock +++ /dev/null @@ -1,110 +0,0 @@ -[root] -name = "gkrust-gtest" -version = "0.1.0" -dependencies = [ - "gkrust-shared 0.1.0", - "mp4parse-gtest 0.1.0", - "nsstring-gtest 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 = [ - "mp4parse_capi 0.6.0", - "nsstring 0.1.0", - "rust_url_capi 0.0.1", -] - -[[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 = "mp4parse" -version = "0.6.0" -dependencies = [ - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mp4parse-gtest" -version = "0.1.0" - -[[package]] -name = "mp4parse_capi" -version = "0.6.0" -dependencies = [ - "mp4parse 0.6.0", -] - -[[package]] -name = "nsstring" -version = "0.1.0" - -[[package]] -name = "nsstring-gtest" -version = "0.1.0" -dependencies = [ - "nsstring 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" -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/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml deleted file mode 100644 index 5611e1777..000000000 --- a/toolkit/library/gtest/rust/Cargo.toml +++ /dev/null @@ -1,44 +0,0 @@ -[package] -name = "gkrust-gtest" -version = "0.1.0" -authors = ["nobody@mozilla.org"] -license = "MPL-2.0" -description = "Testing code for libgkrust" - -[dependencies] -mp4parse-gtest = { path = "../../../../dom/media/gtest" } -nsstring-gtest = { path = "../../../../xpcom/rust/nsstring/gtest" } -gkrust-shared = { path = "../../rust/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 -# This would normally be 'true' for release configurations, but using LTO on -# rul-gtest causes link failures due to symbols also being found in libxul's -# librul.a. But LTO'ing things here is not crucial and not LTO'ing things -# enables us to link libxul-gtest, so we leave it turned off. -lto = false -debug-assertions = false -codegen-units = 1 -panic = "abort" diff --git a/toolkit/library/gtest/rust/lib.rs b/toolkit/library/gtest/rust/lib.rs deleted file mode 100644 index c39801840..000000000 --- a/toolkit/library/gtest/rust/lib.rs +++ /dev/null @@ -1,7 +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/. - -extern crate gkrust_shared; -extern crate mp4parse_gtest; -extern crate nsstring_gtest; diff --git a/toolkit/library/gtest/rust/moz.build b/toolkit/library/gtest/rust/moz.build deleted file mode 100644 index 89827a010..000000000 --- a/toolkit/library/gtest/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-gtest') diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index a9bdf123d..556b779dd 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -394,9 +394,3 @@ if CONFIG['COMPILE_ENVIRONMENT']: # This library needs to be last to make XPCOM module registration work. USE_LIBS += ['StaticXULComponentsEnd'] - -# The above library needs to be last for C++ purposes. This library, -# however, is entirely composed of Rust code, and needs to come after -# all the C++ code so any possible C++ -> Rust calls can be resolved. -if CONFIG['MOZ_RUST']: - USE_LIBS += ['gkrust'] diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock deleted file mode 100644 index 7c1d54ddc..000000000 --- a/toolkit/library/rust/Cargo.lock +++ /dev/null @@ -1,97 +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 = [ - "mp4parse_capi 0.6.0", - "nsstring 0.1.0", - "rust_url_capi 0.0.1", -] - -[[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 = "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" - -[[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" -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 07e735755..000000000 --- a/toolkit/library/rust/shared/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "gkrust-shared" -version = "0.1.0" -authors = ["nobody@mozilla.org"] -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" } - -[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 838b9f379..000000000 --- a/toolkit/library/rust/shared/lib.rs +++ /dev/null @@ -1,7 +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/. - -extern crate mp4parse_capi; -extern crate nsstring; -extern crate rust_url_capi; diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index 7164a8ad5..a782acd3a 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -145,12 +145,6 @@ DIRS += [ if CONFIG['MOZ_GIO_COMPONENT']: DIRS += ['/extensions/gio'] -if CONFIG['MOZ_RUST']: - DIRS += [ - '/toolkit/library/gtest/rust', - '/toolkit/library/rust', - ] - DIRS += [ '/toolkit/library/StaticXULComponentsEnd', '/toolkit/library', |