Backed out changeset 41f948371551 (bug 1624189) for causing bustages in base/nsURLHelper.cpp

CLOSED TREE

netwerk/base/moz.build

@@ -313,7 +313,7 @@ EXTRA_JS_MODULES += [
     'NetUtil.jsm',
 ]
 
-DIRS += [ 'mozurl', 'rust-helper' ]
+DIRS += [ 'mozurl' ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 

netwerk/base/nsURLHelper.cpp

@@ -21,7 +21,7 @@
 #include "prnetdb.h"
 #include "mozilla/Tokenizer.h"
 #include "nsEscape.h"
-#include "mozilla/net/rust_helper.h"
+#include "rust-helper/src/helper.h"
 
 using namespace mozilla;
 
@@ -454,7 +454,7 @@ nsresult net_ExtractURLScheme(const nsACString& inURI, nsACString& scheme) {
 }
 
 bool net_IsValidScheme(const nsACString& scheme) {
-  return rust_net_is_valid_scheme(&scheme);
+  return rust_net_is_valid_scheme(scheme);
 }
 
 bool net_IsAbsoluteURL(const nsACString& uri) {
@@ -952,9 +952,9 @@ bool net_IsValidHostName(const nsACString& host) {
 }
 
 bool net_IsValidIPv4Addr(const nsACString& aAddr) {
-  return rust_net_is_valid_ipv4_addr(&aAddr);
+  return rust_net_is_valid_ipv4_addr(aAddr);
 }
 
 bool net_IsValidIPv6Addr(const nsACString& aAddr) {
-  return rust_net_is_valid_ipv6_addr(&aAddr);
+  return rust_net_is_valid_ipv6_addr(aAddr);
 }

netwerk/base/rust-helper/cbindgen.toml

@@ -1,15 +0,0 @@
-header = """/* 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/. */"""
-autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen. */"""
-include_guard = "mozilla_net_rustHelper_h"
-include_version = true
-braces = "SameLine"
-line_length = 100
-tab_width = 2
-language = "C++"
-namespaces = ["mozilla", "net"]
-includes = ["nsError.h", "nsString.h"]
-
-[export]
-item_types = ["globals", "enums", "structs", "unions", "typedefs", "opaque", "functions", "constants"]

netwerk/base/rust-helper/moz.build

@@ -1,15 +0,0 @@
-# -*- Mode: python; 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/.
-
-if CONFIG['COMPILE_ENVIRONMENT']:
-    GeneratedFile('rust_helper.h',
-                  script='/build/RunCbindgen.py',
-                  entry_point='generate',
-                  inputs=['/netwerk/base/rust-helper'])
-
-    EXPORTS.mozilla.net += [
-        '!rust_helper.h',
-    ]

netwerk/base/rust-helper/src/helper.h

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef RUST_NS_NET_HELPER
+#define RUST_NS_NET_HELPER
+
+#include "nsError.h"
+#include "nsString.h"
+
+extern "C" {
+
+nsresult rust_prepare_accept_languages(const nsACString* i_accept_languages,
+                                       nsACString* o_accept_languages);
+
+bool rust_net_is_valid_ipv4_addr(const nsACString& aAddr);
+
+bool rust_net_is_valid_ipv6_addr(const nsACString& aAddr);
+
+bool rust_net_is_valid_scheme_char(const char aChar);
+
+bool rust_net_is_valid_scheme(const nsACString& scheme);
+}
+
+#endif  // RUST_NS_NET_HELPER

netwerk/protocol/http/nsHttpHandler.cpp

@@ -54,7 +54,7 @@
 #include "nsIXULRuntime.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsRFPService.h"
-#include "mozilla/net/rust_helper.h"
+#include "rust-helper/src/helper.h"
 
 #include "mozilla/net/HttpConnectionMgrParent.h"
 #include "mozilla/net/NeckoChild.h"