PORTREVISION=	1

OPTIONS_DEFINE=		RUST

# XXX lang/rust and devel/cargo currently build only on these platforms

OPTIONS_DEFAULT_aarch64=RUST

OPTIONS_DEFAULT_amd64=	RUST

OPTIONS_DEFAULT_i386=	RUST

--- gfx/2d/ScaledFontBase.cpp.orig	2017-07-31 16:20:54 UTC

+++ gfx/2d/ScaledFontBase.cpp

@@ -212,14 +212,16 @@ ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer 

     cairoPath->AppendPathToBuilder(builder);

     return;

   }

+#endif

+#ifdef USE_SKIA

   if (backendType == BackendType::RECORDING) {

     SkPath skPath = GetSkiaPathForGlyphs(aBuffer);

     RefPtr<Path> path = MakeAndAddRef<PathSkia>(skPath, FillRule::FILL_WINDING);

     path->StreamToSink(aBuilder);

     return;

   }

-  MOZ_ASSERT(false, "Path not being copied");

 #endif

+  MOZ_ASSERT(false, "Path not being copied");

 }

 void

commit 0d02dac1638ad

Author: Alessio Placitelli <alessio.placitelli@gmail.com>

Date:   Tue May 30 10:42:42 2017 +0200

    Bug 1312182 - Consolidate the uses of MOZ_TELEMETRY_REPORTING in the code. r=flod,gfritzsche,jaws

    The MOZ_TELEMETRY_REPORTING define does not control whether or not Telemetry is enabled

    but rather if it will send the gathered data to Mozilla servers. We still want to

    display the about:preferences options and let developers know about this behaviour.

    Please note that this patch is not changing any behaviour: it's only making it explicit

    by showing the options as disabled rather than hiding them.

    MozReview-Commit-ID: 7A0y0E0hm0Q

    --HG--

    extra : rebase_source : 36d1a7f5ec5c05b43731daf9507d3068fe7674ee

---

 browser/base/content/baseMenuOverlay.xul           |  2 +-

 browser/components/nsBrowserGlue.js                |  8 +--

 .../components/preferences/in-content-new/main.xul |  2 -

 .../preferences/in-content-new/privacy.js          | 32 +++++------

 .../preferences/in-content-new/privacy.xul         | 14 ++---

 .../components/preferences/in-content/advanced.js  | 63 +++++++++++-----------

 .../components/preferences/in-content/advanced.xul |  7 ++-

 .../chrome/browser/preferences-old/advanced.dtd    |  5 ++

 .../en-US/chrome/browser/preferences/advanced.dtd  |  5 ++

 9 files changed, 67 insertions(+), 71 deletions(-)

diff --git browser/base/content/baseMenuOverlay.xul browser/base/content/baseMenuOverlay.xul

index 1befa2bb66cc..804bbdebb797 100644

--- browser/base/content/baseMenuOverlay.xul

+++ browser/base/content/baseMenuOverlay.xul

@@ -61,7 +61,7 @@

                   onclick="checkForMiddleClick(this, event);"

                   label="&helpKeyboardShortcuts.label;"

                   accesskey="&helpKeyboardShortcuts.accesskey;"/>

-#ifdef MOZ_TELEMETRY_REPORTING

+#ifdef MOZ_SERVICES_HEALTHREPORT

         <menuitem id="healthReport"

                   label="&healthReport2.label;"

                   accesskey="&healthReport2.accesskey;"

diff --git browser/components/nsBrowserGlue.js browser/components/nsBrowserGlue.js

index 554c279356b9..1c21bf4c4323 100644

--- browser/components/nsBrowserGlue.js

+++ browser/components/nsBrowserGlue.js

@@ -528,9 +528,7 @@ BrowserGlue.prototype = {

     os.addObserver(this, "distribution-customization-complete");

     os.addObserver(this, "handle-xul-text-link");

     os.addObserver(this, "profile-before-change");

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      os.addObserver(this, "keyword-search");

-    }

+    os.addObserver(this, "keyword-search");

     os.addObserver(this, "browser-search-engine-modified");

     os.addObserver(this, "restart-in-safe-mode");

     os.addObserver(this, "flash-plugin-hang");

@@ -583,9 +581,7 @@ BrowserGlue.prototype = {

       os.removeObserver(this, "places-database-locked");

     os.removeObserver(this, "handle-xul-text-link");

     os.removeObserver(this, "profile-before-change");

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      os.removeObserver(this, "keyword-search");

-    }

+    os.removeObserver(this, "keyword-search");

     os.removeObserver(this, "browser-search-engine-modified");

     os.removeObserver(this, "flash-plugin-hang");

     os.removeObserver(this, "xpi-signature-changed");

diff --git browser/components/preferences/in-content-new/main.xul browser/components/preferences/in-content-new/main.xul

index e89ee1891c91..8672557bede2 100644

--- browser/components/preferences/in-content-new/main.xul

+++ browser/components/preferences/in-content-new/main.xul

@@ -183,11 +183,9 @@

               name="layout.spellcheckDefault"

               type="int"/>

-#ifdef MOZ_TELEMETRY_REPORTING

   <preference id="toolkit.telemetry.enabled"

               name="toolkit.telemetry.enabled"

               type="bool"/>

-#endif

   <preference id="browser.preferences.defaultPerformanceSettings.enabled"

               name="browser.preferences.defaultPerformanceSettings.enabled"

diff --git browser/components/preferences/in-content-new/privacy.js browser/components/preferences/in-content-new/privacy.js

index be057bfad611..73f72391b991 100644

--- browser/components/preferences/in-content-new/privacy.js

+++ browser/components/preferences/in-content-new/privacy.js

@@ -321,11 +321,9 @@ var gPrivacyPane = {

       this.initSubmitCrashes();

     }

     this.initTelemetry();

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      this.initSubmitHealthReport();

-      setEventListener("submitHealthReportBox", "command",

-                       gPrivacyPane.updateSubmitHealthReport);

-    }

+    this.initSubmitHealthReport();

+    setEventListener("submitHealthReportBox", "command",

+                     gPrivacyPane.updateSubmitHealthReport);

     // Append search keywords into the elements could open subdialogs.

     let bundlePrefs = document.getElementById("bundlePreferences");

@@ -1414,8 +1412,10 @@ var gPrivacyPane = {

    * In all cases, set up the Learn More link sanely.

    */

   initTelemetry() {

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");

+    this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");

+    // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.

+    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {

+      document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");

     }

   },

@@ -1439,9 +1439,6 @@ var gPrivacyPane = {

    * @param {Boolean} aEnabled False disables the controls, true enables them.

    */

   setTelemetrySectionEnabled(aEnabled) {

-    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {

-      return;

-    }

     // If FHR is disabled, additional data sharing should be disabled as well.

     let disabled = !aEnabled;

     document.getElementById("submitTelemetryBox").disabled = disabled;

@@ -1456,19 +1453,21 @@ var gPrivacyPane = {

    * Initialize the health report service reference and checkbox.

    */

   initSubmitHealthReport() {

-    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {

-      return;

-    }

     this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");

     let checkbox = document.getElementById("submitHealthReportBox");

-    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {

+    // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.

+    // We still want to display the preferences panel if that's not the case, but

+    // we want it to be disabled and unchecked.

+    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||

+        !AppConstants.MOZ_TELEMETRY_REPORTING) {

       checkbox.setAttribute("disabled", "true");

       return;

     }

-    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);

+    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&

+                       AppConstants.MOZ_TELEMETRY_REPORTING;

     this.setTelemetrySectionEnabled(checkbox.checked);

   },

@@ -1476,9 +1475,6 @@ var gPrivacyPane = {

    * Update the health report preference with state from checkbox.

    */

   updateSubmitHealthReport() {

-    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {

-      return;

-    }

     let checkbox = document.getElementById("submitHealthReportBox");

     Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);

     this.setTelemetrySectionEnabled(checkbox.checked);

diff --git browser/components/preferences/in-content-new/privacy.xul browser/components/preferences/in-content-new/privacy.xul

index 9d531bd8274b..8030567573f8 100644

--- browser/components/preferences/in-content-new/privacy.xul

+++ browser/components/preferences/in-content-new/privacy.xul

@@ -760,9 +760,14 @@

 </groupbox>

 <!-- Data Choices -->

-#ifdef MOZ_TELEMETRY_REPORTING

-<groupbox id="historyGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">

+#ifdef MOZ_DATA_REPORTING

+

+<groupbox id="telemetryGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">

 <caption><label>&reports.label;</label></caption>

+#ifndef MOZ_TELEMETRY_REPORTING

+  <description id="TelemetryDisabledDesc" control="telemetryGroup">&healthReportingDisabled.label;</description>

+#endif

+

   <hbox align="center">

     <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"

               accesskey="&enableHealthReport.accesskey;"/>

@@ -782,14 +787,9 @@

                  class="indent">&telemetryDesc.label;</description>

   </vbox>

 </groupbox>

-#endif

-#ifdef MOZ_DATA_REPORTING

 #ifdef MOZ_CRASHREPORTER

 <groupbox id="crashReporterGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">

-#ifndef MOZ_TELEMETRY_REPORTING

-<caption><label>&reports.label;</label></caption>

-#endif

   <hbox align="center">

     <checkbox id="automaticallySubmitCrashesBox"

               preference="browser.crashReports.unsubmittedCheck.autoSubmit"

diff --git browser/components/preferences/in-content/advanced.js browser/components/preferences/in-content/advanced.js

index a6a2abaad9cf..9c7a2e716403 100644

--- browser/components/preferences/in-content/advanced.js

+++ browser/components/preferences/in-content/advanced.js

@@ -46,9 +46,7 @@ var gAdvancedPane = {

       this.initSubmitCrashes();

     }

     this.initTelemetry();

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      this.initSubmitHealthReport();

-    }

+    this.initSubmitHealthReport();

     this.updateOnScreenKeyboardVisibility();

     this.updateCacheSizeInputField();

     this.updateActualCacheSize();

@@ -78,10 +76,8 @@ var gAdvancedPane = {

                      gAdvancedPane.updateHardwareAcceleration);

     setEventListener("advancedPrefs", "select",

                      gAdvancedPane.tabSelectionChanged);

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      setEventListener("submitHealthReportBox", "command",

-                       gAdvancedPane.updateSubmitHealthReport);

-    }

+    setEventListener("submitHealthReportBox", "command",

+                     gAdvancedPane.updateSubmitHealthReport);

     setEventListener("connectionSettings", "command",

                      gAdvancedPane.showConnections);

@@ -293,8 +289,10 @@ var gAdvancedPane = {

    * In all cases, set up the Learn More link sanely.

    */

   initTelemetry() {

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");

+    this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");

+    // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.

+    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {

+      document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");

     }

   },

@@ -303,46 +301,45 @@ var gAdvancedPane = {

    * @param {Boolean} aEnabled False disables the controls, true enables them.

    */

   setTelemetrySectionEnabled(aEnabled) {

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      // If FHR is disabled, additional data sharing should be disabled as well.

-      let disabled = !aEnabled;

-      document.getElementById("submitTelemetryBox").disabled = disabled;

-      if (disabled) {

-        // If we disable FHR, untick the telemetry checkbox.

-        Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);

-      }

-      document.getElementById("telemetryDataDesc").disabled = disabled;

+    // If FHR is disabled, additional data sharing should be disabled as well.

+    let disabled = !aEnabled;

+    document.getElementById("submitTelemetryBox").disabled = disabled;

+    if (disabled) {

+      // If we disable FHR, untick the telemetry checkbox.

+      Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);

     }

+    document.getElementById("telemetryDataDesc").disabled = disabled;

   },

   /**

    * Initialize the health report service reference and checkbox.

    */

   initSubmitHealthReport() {

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");

-

-      let checkbox = document.getElementById("submitHealthReportBox");

+    this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");

-      if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {

-        checkbox.setAttribute("disabled", "true");

-        return;

-      }

+    let checkbox = document.getElementById("submitHealthReportBox");

-      checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);

-      this.setTelemetrySectionEnabled(checkbox.checked);

+    // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.

+    // We still want to display the preferences panel if that's not the case, but

+    // we want it to be disabled and unchecked.

+    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||

+        !AppConstants.MOZ_TELEMETRY_REPORTING) {

+      checkbox.setAttribute("disabled", "true");

+      return;

     }

+

+    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&

+                       AppConstants.MOZ_TELEMETRY_REPORTING;

+    this.setTelemetrySectionEnabled(checkbox.checked);

   },

   /**

    * Update the health report preference with state from checkbox.

    */

   updateSubmitHealthReport() {

-    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

-      let checkbox = document.getElementById("submitHealthReportBox");

-      Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);

-      this.setTelemetrySectionEnabled(checkbox.checked);

-    }

+    let checkbox = document.getElementById("submitHealthReportBox");

+    Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);

+    this.setTelemetrySectionEnabled(checkbox.checked);

   },

   updateOnScreenKeyboardVisibility() {

diff --git browser/components/preferences/in-content/advanced.xul browser/components/preferences/in-content/advanced.xul

index f2330223fb18..1b2c62168a59 100644

--- browser/components/preferences/in-content/advanced.xul

+++ browser/components/preferences/in-content/advanced.xul

@@ -37,12 +37,9 @@

   <preference id="layout.spellcheckDefault"

               name="layout.spellcheckDefault"

               type="int"/>

-

-#ifdef MOZ_TELEMETRY_REPORTING

   <preference id="toolkit.telemetry.enabled"

               name="toolkit.telemetry.enabled"

               type="bool"/>

-#endif

   <!-- Data Choices tab -->

 #ifdef MOZ_CRASHREPORTER

@@ -189,6 +186,9 @@

     <!-- Data Choices -->

     <tabpanel id="dataChoicesPanel" orient="vertical">

 #ifdef MOZ_TELEMETRY_REPORTING

+      <description>&healthReportingDisabled.label;</description>

+      <separator class="thin"/>

+#endif

       <groupbox>

         <caption>

           <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"

@@ -216,7 +216,6 @@

           </hbox>

         </vbox>

       </groupbox>

-#endif

 #ifdef MOZ_CRASHREPORTER

       <groupbox>

         <caption>

diff --git browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd

index 215b800d3385..bf23c4fd251f 100644

--- browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd

+++ browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd

@@ -28,6 +28,11 @@

 <!ENTITY dataChoicesTab.label            "Data Choices">

+<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above

+disabled data sharing options in developer builds or builds with no Telemetry support

+available. -->

+<!ENTITY healthReportingDisabled.label   "Data reporting is disabled for this build configuration">

+

 <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">

 <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">

 <!ENTITY enableHealthReport.accesskey    "R">

diff --git browser/locales/en-US/chrome/browser/preferences/advanced.dtd browser/locales/en-US/chrome/browser/preferences/advanced.dtd

index 58a6b38630cf..6c478e48244a 100644

--- browser/locales/en-US/chrome/browser/preferences/advanced.dtd

+++ browser/locales/en-US/chrome/browser/preferences/advanced.dtd

@@ -28,6 +28,11 @@

 <!ENTITY dataChoicesTab.label            "Data Choices">

+<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above

+disabled data sharing options in developer builds or builds with no Telemetry support

+available. -->

+<!ENTITY healthReportingDisabled.label   "Data reporting is disabled for this build configuration">

+

 <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">

 <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">

 <!ENTITY enableHealthReport.accesskey    "R">

commit ec31e574ed81

Author: Petr Sumbera <petr.sumbera@oracle.com>

Date:   Mon Jun 26 06:54:12 2017 -0700

    Bug 1376268 - Fix Spidermonkey build with no jit backend; r=bbouvier

    MozReview-Commit-ID: DgANwcf8oUh

    --HG--

    extra : amend_source : 1c3efbe975e93ee996e6b84d3fc073781740156d

---

 js/src/jit/ExecutableAllocator.h      | 2 +-

 js/src/jit/none/MacroAssembler-none.h | 8 ++++----

 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h

index 570a25ff0dc3..d106b31ba906 100644

--- js/src/jit/ExecutableAllocator.h

+++ js/src/jit/ExecutableAllocator.h

@@ -219,7 +219,7 @@ class ExecutableAllocator

     static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);

-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)

+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)

     static void cacheFlush(void*, size_t)

     {

     }

diff --git js/src/jit/none/MacroAssembler-none.h js/src/jit/none/MacroAssembler-none.h

index 9a40ec8a8f64..71ddca8b9f1c 100644

--- js/src/jit/none/MacroAssembler-none.h

+++ js/src/jit/none/MacroAssembler-none.h

@@ -48,7 +48,7 @@ static constexpr Register WasmIonExitRegE1 { Registers::invalid_reg };

 static constexpr Register WasmIonExitRegReturnData { Registers::invalid_reg };

 static constexpr Register WasmIonExitRegReturnType { Registers::invalid_reg };

-static constexpr Register WasmIonExitTlsReg = { Registers::invalid_reg };

+static constexpr Register WasmIonExitTlsReg { Registers::invalid_reg };

 static constexpr Register WasmIonExitRegD0 { Registers::invalid_reg };

 static constexpr Register WasmIonExitRegD1 { Registers::invalid_reg };

 static constexpr Register WasmIonExitRegD2 { Registers::invalid_reg };

@@ -153,6 +153,8 @@ class Assembler : public AssemblerShared

     static uintptr_t GetPointer(uint8_t*) { MOZ_CRASH(); }

+    static bool HasRoundInstruction(RoundingMode) { return false; }

+

     void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end,

                                      const Disassembler::HeapAccess& heapAccess)

     {

@@ -196,9 +198,7 @@ class MacroAssemblerNone : public Assembler

     static bool SupportsSimd() { return false; }

     static bool SupportsUnalignedAccesses() { return false; }

-    static bool HasRoundInstruction(RoundingMode) { return false; }

-

-    void executableCopy(void*, bool) { MOZ_CRASH(); }

+    void executableCopy(void*, bool = true) { MOZ_CRASH(); }

     void copyJumpRelocationTable(uint8_t*) { MOZ_CRASH(); }

     void copyDataRelocationTable(uint8_t*) { MOZ_CRASH(); }

     void copyPreBarrierTable(uint8_t*) { MOZ_CRASH(); }

commit ac723ae99f3a

Author: Petr Sumbera <petr.sumbera@oracle.com>

Date:   Tue Jun 27 01:33:49 2017 -0700

    Bug 1376277 - nsWrapperCache.h: add support for 64bits sparc build. r=glandium

---

 dom/base/nsWrapperCache.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git dom/base/nsWrapperCache.h dom/base/nsWrapperCache.h

index b00d7aceb5c8..994ed73332ff 100644

--- dom/base/nsWrapperCache.h

+++ dom/base/nsWrapperCache.h

@@ -41,7 +41,7 @@ class nsWindowRoot;

 // This may waste space for some other nsWrapperCache-derived objects that have

 // a 32-bit field as their first member, but those objects are unlikely to be as

 // numerous or performance-critical as DOM nodes.

-#if defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__)

+#if defined(_M_X64) || defined(__LP64__)

 static_assert(sizeof(void*) == 8, "These architectures should be 64-bit");

 #define BOOL_FLAGS_ON_WRAPPER_CACHE

 #else

Properly restore system timezone on other POSIX systems. r?ehsan

--- toolkit/components/resistfingerprinting/nsRFPService.cpp

+++ toolkit/components/resistfingerprinting/nsRFPService.cpp

@@ -162,14 +162,14 @@ nsRFPService::UpdatePref()

         PR_SetEnv(tz);

       }

     } else {

-#if defined(XP_LINUX) || defined (XP_MACOSX)

-      // For POSIX like system, we reset the TZ to the /etc/localtime, which is the

-      // system timezone.

-      PR_SetEnv("TZ=:/etc/localtime");

-#else

+#if defined(XP_WIN)

       // For Windows, we reset the TZ to an empty string. This will make Windows to use

       // its system timezone.

       PR_SetEnv("TZ=");

+#else

+      // For POSIX like system, we reset the TZ to the /etc/localtime, which is the

+      // system timezone.

+      PR_SetEnv("TZ=:/etc/localtime");

 #endif

     }

   }

Revert bug 1284816, bug 1341967, bug 1336153 to postpone bustage on non-x86 archs.

diff --git browser/confvars.sh browser/confvars.sh

index d8dcd99c2757..740d9d3e5fcf 100755

--- browser/confvars.sh

+++ browser/confvars.sh

@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then

   fi

 fi

+MOZ_RUST_MP4PARSE=1

 if test "$NIGHTLY_BUILD"; then

   MOZ_RUST_URLPARSE=1

 fi

diff --git build/moz.configure/rust.configure build/moz.configure/rust.configure

index 267d989f1597..f709820e60ae 100644

--- build/moz.configure/rust.configure

+++ build/moz.configure/rust.configure

@@ -4,10 +4,20 @@

 # 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/.

-# Rust is required by `rust_compiler` below. We allow_missing here

-# to propagate failures to the better error message there.

-rustc = check_prog('RUSTC', ['rustc'], allow_missing=True)

-cargo = check_prog('CARGO', ['cargo'], allow_missing=True)

+option('--disable-rust', help='Don\'t include Rust language sources')

+

+@depends('--enable-rust')

+def rust_compiler_names(value):

+    if value:

+        return ['rustc']

+

+@depends('--enable-rust')

+def cargo_binary_names(value):

+    if value:

+        return ['cargo']

+

+rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True)

+cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True)

 @depends_if(rustc)

 @checking('rustc version', lambda info: info.version)

@@ -43,9 +53,12 @@ def cargo_info(cargo):

         version=Version(version),

     )

-@depends(rustc_info, cargo_info)

+@depends('--enable-rust', rustc_info, cargo_info)

 @imports(_from='textwrap', _import='dedent')

-def rust_compiler(rustc_info, cargo_info):

+def rust_compiler(value, rustc_info, cargo_info):

+    if not value:

+        return None

+

     if not rustc_info:

         die(dedent('''\

         Rust compiler not found.

@@ -97,6 +110,9 @@ def rust_compiler(rustc_info, cargo_info):

     return True

+set_define('MOZ_RUST', rust_compiler)

+set_config('MOZ_RUST', rust_compiler)

+

 @template

 def rust_triple_alias(host_or_target):

     """Template defining the alias used for rustc's --target flag.

@@ -227,7 +243,8 @@ set_config('RUST_HOST_TARGET', rust_host_triple)

 @depends(rust_target_triple)

 def rust_target_env_name(triple):

-    return triple.upper().replace('-','_')

+    if triple:

+        return triple.upper().replace('-','_')

 # We need this to form various Cargo environment variables, as there is no

 # uppercase function in make, and we don't want to shell out just for

@@ -235,5 +252,6 @@ def rust_target_env_name(triple):

 set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)

 # Until we remove all the other Rust checks in old-configure.

+add_old_configure_assignment('MOZ_RUST', rust_compiler)

 add_old_configure_assignment('RUSTC', rustc)

 add_old_configure_assignment('RUST_TARGET', rust_target_triple)

diff --git config/rules.mk config/rules.mk

index 94cc5556e3d0..7b143ebc5146 100644

--- config/rules.mk

+++ config/rules.mk

@@ -900,6 +900,7 @@ endif

 $(foreach file,$(DUMP_SYMS_TARGETS),$(eval $(call syms_template,$(file),$(file)_syms.track)))

+ifdef MOZ_RUST

 cargo_host_flag := --target=$(RUST_HOST_TARGET)

 cargo_target_flag := --target=$(RUST_TARGET)

@@ -1055,6 +1056,7 @@ force-cargo-host-program-build:

 $(HOST_RUST_PROGRAMS): force-cargo-host-program-build

 endif # HOST_RUST_PROGRAMS

+endif # MOZ_RUST

 $(SOBJS):

 	$(REPORT_BUILD)

diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h

index 4dcc659222a4..559334d89fd1 100644

--- dom/media/MediaPrefs.h

+++ dom/media/MediaPrefs.h

@@ -183,7 +183,7 @@ private:

   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);

   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);

-#if !defined(RELEASE_OR_BETA)

+#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA)

   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);

 #endif

diff --git dom/media/gtest/moz.build dom/media/gtest/moz.build

index c66ac4a9437f..e2203c0a4321 100644

--- dom/media/gtest/moz.build

+++ dom/media/gtest/moz.build

@@ -22,7 +22,6 @@ UNIFIED_SOURCES += [

     'TestMozPromise.cpp',

     'TestMP3Demuxer.cpp',

     'TestMP4Demuxer.cpp',

-    'TestRust.cpp',

     'TestTrackEncoder.cpp',

     'TestVideoSegment.cpp',

     'TestVideoUtils.cpp',

@@ -36,6 +35,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:

         'TestWebMWriter.cpp',

     ]

+if CONFIG['MOZ_RUST']:

+    UNIFIED_SOURCES += ['TestRust.cpp',]

+

 TEST_HARNESS_FILES.gtest += [

     '../test/gizmo-frag.mp4',

     '../test/gizmo.mp4',

diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build

index c65b53b80f63..8953f646e831 100644

--- media/libcubeb/src/moz.build

+++ media/libcubeb/src/moz.build

@@ -32,7 +32,8 @@ if CONFIG['MOZ_PULSEAUDIO']:

         'cubeb_pulse.c',

     ]

     DEFINES['USE_PULSE'] = True

-    DEFINES['USE_PULSE_RUST'] = True

+    if CONFIG['MOZ_RUST']:

+        DEFINES['USE_PULSE_RUST'] = True

 if CONFIG['MOZ_JACK']:

     SOURCES += [

diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp

index 109ea329d154..a06e533b1e62 100644

--- media/libstagefright/binding/DecoderData.cpp

+++ media/libstagefright/binding/DecoderData.cpp

@@ -13,9 +13,11 @@

 #include "mozilla/ArrayUtils.h"

 #include "include/ESDS.h"

+#ifdef MOZ_RUST_MP4PARSE

 // OpusDecoder header is really needed only by MP4 in rust

 #include "OpusDecoder.h"

 #include "mp4parse.h"

+#endif // MOZ_RUST_MP4PARSE

 using namespace stagefright;

 using mozilla::media::TimeUnit;

@@ -177,6 +179,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)

   FindData(aMetaData, kKeyAVCC, mExtraData);

 }

+#ifdef MOZ_RUST_MP4PARSE

 static void

 UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,

                          const mp4parse_sinf_info& aSinf)

@@ -263,6 +266,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,

     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);

   }

 }

+#endif // MOZ_RUST_MP4PARSE

 bool

 MP4VideoInfo::IsValid() const

diff --git media/libstagefright/binding/MP4Metadata.cpp media/libstagefright/binding/MP4Metadata.cpp

index 5c3810d99a38..5d14dfd8b8a9 100644

--- media/libstagefright/binding/MP4Metadata.cpp

+++ media/libstagefright/binding/MP4Metadata.cpp

@@ -20,14 +20,18 @@

 #include "mp4_demuxer/MP4Metadata.h"

 #include "mp4_demuxer/Stream.h"

 #include "MediaPrefs.h"

+#ifdef MOZ_RUST_MP4PARSE

 #include "mp4parse.h"

+#endif // MOZ_RUST_MP4PARSE

 #include <limits>

 #include <stdint.h>

 #include <vector>

+#ifdef MOZ_RUST_MP4PARSE

 struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } };

+#endif // MOZ_RUST_MP4PARSE

 using namespace stagefright;

 using mozilla::media::TimeUnit;

@@ -105,6 +109,7 @@ private:

   bool mCanSeek;

 };

+#ifdef MOZ_RUST_MP4PARSE

 // Wrap an mp4_demuxer::Stream to remember the read offset.

 class RustStreamAdaptor {

@@ -151,6 +156,7 @@ private:

   RustStreamAdaptor mRustSource;

   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;

 };

+#endif // MOZ_RUST_MP4PARSE

 class IndiceWrapperStagefright : public IndiceWrapper {

 public:

@@ -187,6 +193,7 @@ IndiceWrapperStagefright::GetIndice(size_t aIndex, Index::Indice& aIndice) const

   return true;

 }

+#ifdef MOZ_RUST_MP4PARSE

 // the owner of mIndice is rust mp4 paser, so lifetime of this class

 // SHOULD NOT longer than rust parser.

 class IndiceWrapperRust : public IndiceWrapper

@@ -232,9 +239,11 @@ IndiceWrapperRust::GetIndice(size_t aIndex, Index::Indice& aIndice) const

   aIndice.sync = indice->sync;

   return true;

 }

+#endif // MOZ_RUST_MP4PARSE

 MP4Metadata::MP4Metadata(Stream* aSource)

  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))

+#ifdef MOZ_RUST_MP4PARSE

  , mRust(MakeUnique<MP4MetadataRust>(aSource))

  , mPreferRust(MediaPrefs::EnableRustMP4Parser())

  , mReportedAudioTrackTelemetry(false)

@@ -242,6 +251,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)

 #ifndef RELEASE_OR_BETA

  , mRustTestMode(MediaPrefs::RustTestMode())

 #endif

+#endif // MOZ_RUST_MP4PARSE

 {

 }

@@ -274,8 +284,11 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const

   MP4Metadata::ResultAndTrackCount numTracks =

     mStagefright->GetNumberTracks(aType);

+#ifdef MOZ_RUST_MP4PARSE

   if (!mRust) {

+#endif // MOZ_RUST_MP4PARSE

     return numTracks;

+#ifdef MOZ_RUST_MP4PARSE

   }

   MP4Metadata::ResultAndTrackCount numTracksRust =

@@ -350,8 +363,10 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const

   // Same non-error numbers, just return any.

   // (Choosing Rust here, in case it carries a warning, we'd want to know that.)

   return numTracksRust;

+#endif // MOZ_RUST_MP4PARSE

 }

+#ifdef MOZ_RUST_MP4PARSE

 bool MP4Metadata::ShouldPreferRust() const {

   if (!mRust) {

     return false;

@@ -389,6 +404,7 @@ bool MP4Metadata::ShouldPreferRust() const {

   // Otherwise, fall back.

   return false;

 }

+#endif // MOZ_RUST_MP4PARSE

 static const char*

 GetDifferentField(const mozilla::TrackInfo& info,

@@ -443,6 +459,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,

   MP4Metadata::ResultAndTrackInfo info =

     mStagefright->GetTrackInfo(aType, aTrackNumber);

+#ifdef MOZ_RUST_MP4PARSE

   if (!mRust) {

     return info;

   }

@@ -514,6 +531,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,

   if (mPreferRust) {

     return infoRust;

   }

+#endif // MOZ_RUST_MP4PARSE

   return info;

 }

@@ -528,6 +546,7 @@ MP4Metadata::ResultAndCryptoFile

 MP4Metadata::Crypto() const

 {

   MP4Metadata::ResultAndCryptoFile crypto = mStagefright->Crypto();

+#ifdef MOZ_RUST_MP4PARSE

   MP4Metadata::ResultAndCryptoFile rustCrypto = mRust->Crypto();

 #ifndef RELEASE_OR_BETA

@@ -548,6 +567,7 @@ MP4Metadata::Crypto() const

   if (mPreferRust) {

     return rustCrypto;

   }

+#endif // MOZ_RUST_MP4PARSE

   return crypto;

 }

@@ -556,17 +576,22 @@ MP4Metadata::ResultAndIndice

 MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)

 {

   FallibleTArray<Index::Indice> indiceSF;

+#ifdef MOZ_RUST_MP4PARSE

   if (!mPreferRust

 #ifndef RELEASE_OR_BETA

       || mRustTestMode

 #endif

      ) {

+#endif // MOZ_RUST_MP4PARSE

     MediaResult rv = mStagefright->ReadTrackIndex(indiceSF, aTrackID);

     if (NS_FAILED(rv)) {

       return {Move(rv), nullptr};

     }

+#ifdef MOZ_RUST_MP4PARSE

   }

+#endif // MOZ_RUST_MP4PARSE

+#ifdef MOZ_RUST_MP4PARSE

   mp4parse_byte_data indiceRust = {};

   if (mPreferRust

 #ifndef RELEASE_OR_BETA

@@ -592,13 +617,18 @@ MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)

     }

   }

 #endif

+#endif // MOZ_RUST_MP4PARSE

   UniquePtr<IndiceWrapper> indice;

+#ifdef MOZ_RUST_MP4PARSE

   if (mPreferRust) {

     indice = mozilla::MakeUnique<IndiceWrapperRust>(indiceRust);

   } else {

+#endif // MOZ_RUST_MP4PARSE

     indice = mozilla::MakeUnique<IndiceWrapperStagefright>(indiceSF);

+#ifdef MOZ_RUST_MP4PARSE

   }

+#endif // MOZ_RUST_MP4PARSE

   return {NS_OK, Move(indice)};

 }

@@ -856,6 +886,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)

   return {NS_OK, Move(buffer)};

 }

+#ifdef MOZ_RUST_MP4PARSE

 bool

 RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)

 {

@@ -1152,5 +1183,6 @@ MP4MetadataRust::Metadata(Stream* aSource)

   MOZ_ASSERT(false, "Not yet implemented");

   return {NS_ERROR_NOT_IMPLEMENTED, nullptr};

 }

+#endif // MOZ_RUST_MP4PARSE

 } // namespace mp4_demuxer

diff --git media/libstagefright/binding/include/mp4_demuxer/DecoderData.h media/libstagefright/binding/include/mp4_demuxer/DecoderData.h

index 3cd4b7c142f4..dc25ddf03b10 100644

--- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h

+++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h

@@ -19,11 +19,13 @@ namespace stagefright

 class MetaData;

 }

+#ifdef MOZ_RUST_MP4PARSE

 extern "C" {

 typedef struct mp4parse_track_info mp4parse_track_info;

 typedef struct mp4parse_track_audio_info mp4parse_track_audio_info;

 typedef struct mp4parse_track_video_info mp4parse_track_video_info;

 }

+#endif // MOZ_RUST_MP4PARSE

 namespace mp4_demuxer

 {

@@ -71,8 +73,10 @@ public:

   void Update(const stagefright::MetaData* aMetaData,

               const char* aMimeType);

+#ifdef MOZ_RUST_MP4PARSE

   void Update(const mp4parse_track_info* track,

               const mp4parse_track_audio_info* audio);

+#endif // MOZ_RUST_MP4PARSE

   virtual bool IsValid() const override;

 };

@@ -85,8 +89,10 @@ public:

   void Update(const stagefright::MetaData* aMetaData,

               const char* aMimeType);

+#ifdef MOZ_RUST_MP4PARSE

   void Update(const mp4parse_track_info* track,

               const mp4parse_track_video_info* video);

+#endif // MOZ_RUST_MP4PARSE

   virtual bool IsValid() const override;

 };

diff --git media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h

index 492c9c1c1bc3..e16dbbd1155e 100644

--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h

+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h

@@ -13,7 +13,9 @@

 #include "MediaInfo.h"

 #include "MediaResult.h"

 #include "Stream.h"

+#ifdef MOZ_RUST_MP4PARSE

 #include "mp4parse.h"

+#endif // MOZ_RUST_MP4PARSE

 namespace mp4_demuxer {

@@ -82,6 +84,7 @@ public:

 private:

   UniquePtr<MP4MetadataStagefright> mStagefright;

+#ifdef MOZ_RUST_MP4PARSE

   UniquePtr<MP4MetadataRust> mRust;

   mutable bool mPreferRust;

   mutable bool mReportedAudioTrackTelemetry;

@@ -90,6 +93,7 @@ private:

   mutable bool mRustTestMode;

 #endif

   bool ShouldPreferRust() const;

+#endif // MOZ_RUST_MP4PARSE

 };

 } // namespace mp4_demuxer

diff --git media/libstagefright/gtest/moz.build media/libstagefright/gtest/moz.build

index be4d56fc93f7..66fdd365f8f3 100644

--- media/libstagefright/gtest/moz.build

+++ media/libstagefright/gtest/moz.build

@@ -38,12 +38,13 @@ TEST_HARNESS_FILES.gtest += [

     'test_case_1351094.mp4',

 ]

-UNIFIED_SOURCES += ['TestMP4Rust.cpp',]

-TEST_HARNESS_FILES.gtest += [

-    '../../../dom/media/test/street.mp4',

-]

-LOCAL_INCLUDES += [

-    '../binding/include',

-]

+if CONFIG['MOZ_RUST']:

+    UNIFIED_SOURCES += ['TestMP4Rust.cpp',]

+    TEST_HARNESS_FILES.gtest += [

+        '../../../dom/media/test/street.mp4',

+    ]

+    LOCAL_INCLUDES += [

+        '../binding/include',

+    ]

 FINAL_LIBRARY = 'xul-gtest'

diff --git media/libstagefright/moz.build media/libstagefright/moz.build

index af5d1194d621..6725a0179989 100644

--- media/libstagefright/moz.build

+++ media/libstagefright/moz.build

@@ -83,9 +83,10 @@ SOURCES += [

     'system/core/libutils/VectorImpl.cpp',

 ]

-EXPORTS += [

-    'binding/include/mp4parse.h',

-]

+if CONFIG['MOZ_RUST']:

+    EXPORTS += [

+        'binding/include/mp4parse.h',

+    ]

 UNIFIED_SOURCES += [

     'binding/Adts.cpp',

diff --git mobile/android/confvars.sh mobile/android/confvars.sh

index e79b6f5c0707..eb62763acaf7 100644

--- mobile/android/confvars.sh

+++ mobile/android/confvars.sh

@@ -30,6 +30,8 @@ MOZ_XULRUNNER=

 MOZ_CAPTURE=1

 MOZ_RAW=1

+MOZ_RUST_MP4PARSE=1

+

 # use custom widget for html:select

 MOZ_USE_NATIVE_POPUP_WINDOWS=1

diff --git netwerk/base/moz.build netwerk/base/moz.build

index 61d022a9660e..e5ca1d77d859 100644

--- netwerk/base/moz.build

+++ netwerk/base/moz.build

@@ -256,7 +256,7 @@ UNIFIED_SOURCES += [

     'TLSServerSocket.cpp',

 ]

-if CONFIG['MOZ_RUST_URLPARSE']:

+if CONFIG['MOZ_RUST'] and CONFIG['MOZ_RUST_URLPARSE']:

     EXPORTS.mozilla.net += [ 'RustURL.h' ]

     UNIFIED_SOURCES += [ 'RustURL.cpp' ]

diff --git netwerk/base/nsStandardURL.cpp netwerk/base/nsStandardURL.cpp

index 608b918a4ecf..20bcdeb34ab8 100644

--- netwerk/base/nsStandardURL.cpp

+++ netwerk/base/nsStandardURL.cpp

@@ -858,6 +858,7 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)

         if (!SegmentIs(spec, mScheme, "resource") &&

             !SegmentIs(spec, mScheme, "chrome")) {

             nsAutoCString ipString;

+#ifdef MOZ_RUST

             if (encHost.Length() > 0 &&

                 encHost.First() == '[' && encHost.Last() == ']' &&

                 ValidIPv6orHostname(encHost.get(), encHost.Length())) {

@@ -866,7 +867,9 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)

                     return rv;

                 }

                 encHost = ipString;

-            } else if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {

+            } else

+#endif

+            if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {

                 encHost = ipString;

             }

         }

@@ -2112,6 +2115,7 @@ nsStandardURL::SetHost(const nsACString &input)

     if (!SegmentIs(mScheme, "resource") && !SegmentIs(mScheme, "chrome")) {

         nsAutoCString ipString;

+#ifdef MOZ_RUST

         if (hostBuf.Length() > 0 &&

             hostBuf.First() == '[' && hostBuf.Last() == ']' &&

             ValidIPv6orHostname(hostBuf.get(), hostBuf.Length())) {

@@ -2120,7 +2124,9 @@ nsStandardURL::SetHost(const nsACString &input)

                 return rv;

             }

             hostBuf = ipString;

-        } else if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {

+        } else

+#endif

+        if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {

           hostBuf = ipString;

         }

     }

diff --git old-configure.in old-configure.in

index 717a94fcc692..54b29d737cc1 100644

--- old-configure.in

+++ old-configure.in

@@ -2330,9 +2330,14 @@ if test -n "$MOZ_MULET"; then

 fi

 # Propagate feature switches for code written in rust from confvars.sh

-if test -n "$MOZ_RUST_URLPARSE"; then

-    AC_DEFINE(MOZ_RUST_URLPARSE)

-    AC_SUBST(MOZ_RUST_URLPARSE)

+if test -n "$MOZ_RUST"; then

+    if test -n "$MOZ_RUST_MP4PARSE"; then

+        AC_DEFINE(MOZ_RUST_MP4PARSE)

+    fi

+    if test -n "$MOZ_RUST_URLPARSE"; then

+        AC_DEFINE(MOZ_RUST_URLPARSE)

+        AC_SUBST(MOZ_RUST_URLPARSE)

+    fi

 fi

 AC_SUBST(MOZ_PHOENIX)

diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json

index 061c55f6a5b6..e49dfd176952 100644

--- toolkit/components/telemetry/Histograms.json

+++ toolkit/components/telemetry/Histograms.json

@@ -8320,7 +8320,8 @@

     "expires_in_version": "60",

     "kind": "boolean",

     "bug_numbers": [1220885],

-    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment."

+    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment.",

+    "cpp_guard": "MOZ_RUST_MP4PARSE"

   },

   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {

     "record_in_processes": ["main", "content"],

@@ -8329,7 +8330,8 @@

     "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."

+    "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": {

     "record_in_processes": ["main", "content"],

@@ -8337,7 +8339,8 @@

     "expires_in_version": "60",

     "kind": "boolean",

     "bug_numbers": [1231169],

-    "description": "Whether rust and stagefight mp4 parser audio track results match."

+    "description": "Whether rust and stagefight mp4 parser audio track results match.",

+    "cpp_guard": "MOZ_RUST_MP4PARSE"

   },

   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {

     "record_in_processes": ["main", "content"],

@@ -8345,7 +8348,8 @@

     "expires_in_version": "60",

     "kind": "boolean",

     "bug_numbers": [1231169],

-    "description": "Whether rust and stagefight mp4 parser video track results match."

+    "description": "Whether rust and stagefight mp4 parser video track results match.",

+    "cpp_guard": "MOZ_RUST_MP4PARSE"

   },

   "MEDIA_WMF_DECODE_ERROR": {

     "record_in_processes": ["main", "content", "gpu"],

diff --git toolkit/library/gtest/moz.build toolkit/library/gtest/moz.build

index 69a8fb1f4893..c684f48e456e 100644

--- toolkit/library/gtest/moz.build

+++ toolkit/library/gtest/moz.build

@@ -7,7 +7,6 @@

 FINAL_TARGET = 'dist/bin/gtest'

 USE_LIBS += [

-    'gkrust-gtest',

     'static:xul',

     # xul-gtest is an intermediate static library. It is used as FINAL_TARGET

     # for gtest code.

@@ -21,6 +20,11 @@ USE_LIBS += [

 # before StaticXULComponentStart.

 Libxul('xul-gtest-real')

+if CONFIG['MOZ_RUST']:

+    USE_LIBS += [

+        'gkrust-gtest',

+    ]

+

 DIRS += [

     'static',

 ]

diff --git toolkit/library/moz.build toolkit/library/moz.build

index 650f6eaba980..191e90ceb09a 100644

--- toolkit/library/moz.build

+++ toolkit/library/moz.build

@@ -63,7 +63,7 @@ def Libxul(name):

     # This option should go away in bug 1290972, but we need to wait until

     # Rust 1.12 has been released.

-    if CONFIG['OS_ARCH'] == 'Darwin':

+    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':

         LDFLAGS += ['-Wl,-no_compact_unwind']

 Libxul('xul')

@@ -343,4 +343,5 @@ 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.

-USE_LIBS += ['gkrust']

+if CONFIG['MOZ_RUST']:

+    USE_LIBS += ['gkrust']

diff --git toolkit/moz.configure toolkit/moz.configure

index ac9d123224ce..e90da70f0fa5 100644

--- toolkit/moz.configure

+++ toolkit/moz.configure

@@ -88,8 +88,7 @@ include('../js/moz.configure')

 # Rust

 # ==============================================================

-include('../build/moz.configure/rust.configure',

-        when='--enable-compile-environment')

+include('../build/moz.configure/rust.configure')

 # L10N

@@ -623,13 +622,13 @@ id_and_secret_keyfile('Leanplum SDK')

 option('--enable-stylo', nargs='?', choices=('build',),

        help='Include Stylo in the build and/or enable it at runtime')

-@depends('--enable-stylo')

-def stylo_config(value):

+@depends('--enable-stylo', '--enable-rust')

+def stylo_config(value, rust_enabled):

     build_stylo = None

     enable_stylo = None

     # The default is to not build Stylo at all.

-    if value.origin == 'default':

+    if not rust_enabled or value.origin == 'default':

         pass

     elif value == 'build':

         build_stylo = True

@@ -769,12 +768,14 @@ set_config('SERVO_TARGET_DIR', servo_target_dir)

 option('--enable-webrender', nargs='?', choices=('build',),

        help='Include WebRender in the build and/or enable it at runtime')

-@depends('--enable-webrender', milestone)

-def webrender(value, milestone):

+@depends('--enable-webrender', '--enable-rust', milestone)

+def webrender(value, rust_enabled, milestone):

     build_webrender = None

     enable_webrender = None

-    if value.origin == 'default':

+    if not rust_enabled:

+        pass

+    elif value.origin == 'default':

         # if nothing is specified, default to just building on Nightly

         build_webrender = milestone.is_nightly

     elif value == 'build':

diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild

index b845aab48023..9215afc6dd2d 100644

--- toolkit/toolkit.mozbuild

+++ toolkit/toolkit.mozbuild

@@ -133,16 +133,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:

 DIRS += [

     '/devtools',

-    '/toolkit/library',

-    '/toolkit/library/gtest/rust',

-    '/toolkit/library/rust',

-    '/toolkit/library/StaticXULComponentsEnd',

     '/services',

     '/startupcache',

     '/js/ductwork/debugger',

     '/other-licenses/snappy',

 ]

+if CONFIG['MOZ_RUST']:

+    DIRS += [

+        '/toolkit/library/gtest/rust',

+        '/toolkit/library/rust',

+    ]

+

+DIRS += [

+    '/toolkit/library/StaticXULComponentsEnd',

+    '/toolkit/library',

+]

+

 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:

     DIRS += ['/toolkit/system/gnome']

diff --git toolkit/xre/nsAppRunner.cpp toolkit/xre/nsAppRunner.cpp

index 667c2eb1b365..6fb6cf102baa 100644

--- toolkit/xre/nsAppRunner.cpp

+++ toolkit/xre/nsAppRunner.cpp

@@ -227,11 +227,13 @@

 extern uint32_t gRestartMode;

 extern void InstallSignalHandlers(const char *ProgramName);

+#ifdef MOZ_RUST

 // This workaround is fixed in Rust 1.19. For details, see bug 1358151.

 // Implementation in toolkit/library/rust/shared/lib.rs

 extern "C" {

   void rust_init_please_remove_this_after_updating_rust_1_19();

 }

+#endif

 #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")

 #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")

@@ -3122,8 +3124,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)

     return 1;

   *aExitFlag = false;

+#ifdef MOZ_RUST

   // This workaround is fixed in Rust 1.19. For details, see bug 1358151.

   rust_init_please_remove_this_after_updating_rust_1_19();

+#endif

   atexit(UnexpectedExit);

   auto expectedShutdown = mozilla::MakeScopeExit([&] {

diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp

index e6bb623c258b..c49d61dce605 100644

--- xpcom/base/nsDebugImpl.cpp

+++ xpcom/base/nsDebugImpl.cpp

@@ -148,14 +148,20 @@ nsDebugImpl::Abort(const char* aFile, int32_t aLine)

   return NS_OK;

 }

+#ifdef MOZ_RUST

 // From toolkit/library/rust/lib.rs

 extern "C" void intentional_panic(const char* message);

+#endif

 NS_IMETHODIMP

 nsDebugImpl::RustPanic(const char* aMessage)

 {

+#ifdef MOZ_RUST

   intentional_panic(aMessage);

   return NS_OK;

+#else

+  return NS_ERROR_NOT_IMPLEMENTED;

+#endif

 }

 NS_IMETHODIMP

diff --git xpcom/rust/nsstring/gtest/moz.build xpcom/rust/nsstring/gtest/moz.build

index 197411678815..5bed9e57e57d 100644

--- xpcom/rust/nsstring/gtest/moz.build

+++ xpcom/rust/nsstring/gtest/moz.build

@@ -4,8 +4,9 @@

 # 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/.

-UNIFIED_SOURCES += [

-    'Test.cpp'

-]

+if CONFIG['MOZ_RUST']:

+    UNIFIED_SOURCES += [