Commit a8ad39a2 authored by Butkovits Atila's avatar Butkovits Atila
Browse files

Backed out 6 changesets (bug 1766045) for causing build bustages. CLOSED TREE 

Backed out changeset 113593df6272 (bug 1766045)
Backed out changeset f137315bb6af (bug 1766045)
Backed out changeset d86ad195a9a0 (bug 1766045)
Backed out changeset e8bc2ec40cff (bug 1766045)
Backed out changeset 2d33e41ac507 (bug 1766045)
Backed out changeset 4d5874e16302 (bug 1766045)
parent 81ed1702

.cargo/config.in

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ git = "https://github.com/rust-minidump/minidump-writer.git" 
replace-with = "vendored-sources"

rev = "75ada456c92a429704691a85e1cb42fef8cafc0d"



[source."https://github.com/mozilla/uniffi-rs.git"]

git = "https://github.com/mozilla/uniffi-rs.git"

replace-with = "vendored-sources"

rev = "bb2039f077a29dba0879372a67e764e6ace8e33f"



[source."https://github.com/mozilla/neqo"]

git = "https://github.com/mozilla/neqo"

replace-with = "vendored-sources"

.clang-format-ignore

+0 −6
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ widget/gtk/MPRISInterfaceDescription.h 
xpcom/reflect/xptcall/md/win32/.*

xpcom/reflect/xptcall/md/unix/.*



# Askama template code, which isn't valid C++ in its original form

toolkit/components/uniffi-bindgen-gecko-js/src/templates/.*

# Generated from that template code

toolkit/components/uniffi-js/UniFFIGeneratedScaffolding.cpp

toolkit/components/uniffi-js/UniFFIFixtureScaffolding.cpp



# Generated from ./tools/rewriting/ThirdPartyPaths.txt

# awk '{print ""$1".*"}' ./tools/rewriting/ThirdPartyPaths.txt

browser/components/translation/cld2/.*

.eslintignore

+0 −3
Original line number Diff line number Diff line
@@ -228,6 +228,3 @@ toolkit/components/backgroundtasks/defaults 


# Ignore pre-generated webpack and typescript transpiled files for translations

browser/extensions/translations/extension/
 


# "scaffolding" used by uniffi which isn't valid JS in its original form.

toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/

Cargo.lock

+0 −86
Original line number Diff line number Diff line
@@ -1549,18 +1549,6 @@ dependencies = [ 
 "serde",

]



[[package]]

name = "extend"

version = "1.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c5216e387a76eebaaf11f6d871ec8a4aae0b25f05456ee21f228e024b1b3610"

dependencies = [

 "proc-macro-error",

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "fallible-iterator"

version = "0.2.0"
@@ -2176,11 +2164,6 @@ dependencies = [ 
 "tokio-threadpool",

 "unic-langid",

 "unic-langid-ffi",

 "uniffi-example-arithmetic",

 "uniffi-example-geometry",

 "uniffi-example-rondpoint",

 "uniffi-example-sprites",

 "uniffi-example-todolist",

 "url",

 "viaduct",

 "webext_storage_bridge",
@@ -5619,75 +5602,6 @@ dependencies = [ 
 "log",

 "paste",

 "static_assertions",

 "uniffi_bindgen",

]



[[package]]

name = "uniffi-bindgen-gecko-js"

version = "0.1.0"

dependencies = [

 "anyhow",

 "askama",

 "camino",

 "clap",

 "extend",

 "heck",

 "serde",

 "toml 0.5.9",

 "uniffi_bindgen",

]



[[package]]

name = "uniffi-example-arithmetic"

version = "0.18.0"

source = "git+https://github.com/mozilla/uniffi-rs.git?rev=bb2039f077a29dba0879372a67e764e6ace8e33f#bb2039f077a29dba0879372a67e764e6ace8e33f"

dependencies = [

 "thiserror",

 "uniffi",

 "uniffi_build",

 "uniffi_macros",

]



[[package]]

name = "uniffi-example-geometry"

version = "0.18.0"

source = "git+https://github.com/mozilla/uniffi-rs.git?rev=bb2039f077a29dba0879372a67e764e6ace8e33f#bb2039f077a29dba0879372a67e764e6ace8e33f"

dependencies = [

 "uniffi",

 "uniffi_build",

 "uniffi_macros",

]



[[package]]

name = "uniffi-example-rondpoint"

version = "0.18.0"

source = "git+https://github.com/mozilla/uniffi-rs.git?rev=bb2039f077a29dba0879372a67e764e6ace8e33f#bb2039f077a29dba0879372a67e764e6ace8e33f"

dependencies = [

 "uniffi",

 "uniffi_build",

 "uniffi_macros",

]



[[package]]

name = "uniffi-example-sprites"

version = "0.18.0"

source = "git+https://github.com/mozilla/uniffi-rs.git?rev=bb2039f077a29dba0879372a67e764e6ace8e33f#bb2039f077a29dba0879372a67e764e6ace8e33f"

dependencies = [

 "uniffi",

 "uniffi_build",

 "uniffi_macros",

]



[[package]]

name = "uniffi-example-todolist"

version = "0.18.0"

source = "git+https://github.com/mozilla/uniffi-rs.git?rev=bb2039f077a29dba0879372a67e764e6ace8e33f#bb2039f077a29dba0879372a67e764e6ace8e33f"

dependencies = [

 "lazy_static",

 "thiserror",

 "uniffi",

 "uniffi_build",

 "uniffi_macros",

]



[[package]]

Cargo.toml

+0 −14
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ members = [ 
  "security/manager/ssl/ipcclientcerts",

  "security/manager/ssl/osclientcerts",

  "testing/geckodriver",

  "toolkit/components/uniffi-bindgen-gecko-js",

  "toolkit/crashreporter/rust_minidump_writer_linux",

  "toolkit/crashreporter/mozwer-rust",

  "toolkit/library/gtest/rust",
@@ -165,16 +164,3 @@ path = "third_party/rust/mio-0.6.23" 
# https://github.com/mozilla/neqo/pull/1350

[patch."https://github.com/mozilla/neqo"]

neqo-common = { path = "third_party/rust/neqo-common" }
 


# These are used to test UniFFI functionality.  We haven't figured out how we

# want to publish these yet, so they are only accessible via git.  This works

# okay, but it means that their dependencies on UniFFI crates will normally

# also be the git versions.  Patch them to use the published versions to avoid

# duplicate crates.



[patch."https://github.com/mozilla/uniffi-rs.git"]

uniffi = "0.19"

uniffi_bindgen = "0.19"

uniffi_build = "0.19"

uniffi_macros = "0.19"

weedle2 = "3.0.0"