Backed out 2 changesets (bug 1591563) for build bustages force-cargo-library-build on a CLOSED TREE

Backed out changeset c533ffe37892 (bug 1591563)
Backed out changeset 12900ca1c780 (bug 1591563)

Cargo.lock

@@ -1145,10 +1145,6 @@ name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "fog"
-version = "0.1.0"
-
 [[package]]
 name = "foreign-types"
 version = "0.3.0"
@@ -1426,7 +1422,6 @@ dependencies = [
  "cubeb-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding_glue 0.1.0",
  "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "fog 0.1.0",
  "geckoservo 0.0.1",
  "gkrust_utils 0.1.0",
  "jsrust_shared 0.1.0",

toolkit/components/telemetry/fog/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "fog"
-version = "0.1.0"
-authors = ["Chris H-C <chutten@mozilla.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]

toolkit/components/telemetry/fog/src/lib.rs

@@ -1,7 +0,0 @@
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}

toolkit/library/rust/Cargo.toml

@@ -30,7 +30,6 @@ fuzzing_interfaces = ["gkrust-shared/fuzzing_interfaces"]
 webrtc = ["gkrust-shared/webrtc"]
 wasm_library_sandboxing = ["gkrust-shared/wasm_library_sandboxing"]
 webgpu = ["gkrust-shared/webgpu"]
-fogotype = ["gkrust-shared/fogotype"]
 
 [dependencies]
 gkrust-shared = { path = "shared" }

toolkit/library/rust/gkrust-features.mozbuild

@@ -67,6 +67,3 @@ if CONFIG['FUZZING_INTERFACES']:
 
 if CONFIG['MOZ_WEBRTC']:
     gkrust_features += ['webrtc']
-
-if CONFIG['MOZ_FOGOTYPE']:
-    gkrust_features += ['fogotype']

toolkit/library/rust/shared/Cargo.toml

@@ -45,7 +45,6 @@ neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu-remote = { path = "../../../../gfx/wgpu/wgpu-remote", optional = true }
 mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", tag = "v0.3.0" }
-fog = { path = "../../../components/telemetry/fog", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -75,7 +74,6 @@ fuzzing_interfaces = []
 webrtc = ["mdns_service"]
 wasm_library_sandboxing = ["rlbox_lucet_sandbox"]
 webgpu = ["wgpu-remote"]
-fogotype = ["fog"]
 
 [lib]
 path = "lib.rs"

toolkit/library/rust/shared/lib.rs

@@ -46,8 +46,6 @@ extern crate storage;
 #[cfg(feature = "moz_places")]
 extern crate bookmark_sync;
 extern crate shift_or_euc_c;
-#[cfg(feature = "fogotype")]
-extern crate fog;
 
 extern crate audio_thread_priority;
 

toolkit/moz.configure

@@ -1892,14 +1892,3 @@ def new_cert_storage(milestone):
 
 set_config('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)
 set_define('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)
-
-# FOGotype prototype Glean SDK Integration Crate
-# ==============================================================
-
-@depends(milestone)
-def fogotype(milestone):
-    if milestone.is_nightly:
-        return True
-
-set_config('MOZ_FOGOTYPE', True, when=fogotype)
-set_define('MOZ_FOGOTYPE', True, when=fogotype)