Merge remote-tracking branch 'origin/master' into fcitx

Author: Fcitx Bot

src/android/jni/mozcjni.cc

@@ -29,7 +29,6 @@
 
 // JNI wrapper for SessionHandler.
 
-#include <utility>
 #ifdef __ANDROID__
 
 #include <jni.h>

src/base/BUILD.bazel

@@ -641,6 +641,7 @@ mozc_cc_library(
         ":system_util",
         ":util",
         ":vlog",
+        "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",

src/base/file_stream.cc

@@ -31,7 +31,6 @@
 
 #include <fstream>
 #include <ios>
-#include <string>
 
 #include "base/strings/pfchar.h"
 #include "base/strings/zstring_view.h"

src/base/file_stream.h

@@ -32,7 +32,6 @@
 
 #include <fstream>
 #include <ios>
-#include <string>
 
 #include "base/strings/zstring_view.h"
 

src/base/file_util_mock.h

@@ -30,7 +30,6 @@
 #ifndef MOZC_BASE_FILE_UTIL_MOCK_H_
 #define MOZC_BASE_FILE_UTIL_MOCK_H_
 
-#include <map>
 #include <string>
 
 #include "absl/container/btree_map.h"

src/base/process_mutex.h

@@ -31,7 +31,9 @@
 #define MOZC_BASE_PROCESS_MUTEX_H_
 
 #include <string>
+#include <utility>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 

src/composer/char_chunk.h

@@ -31,6 +31,7 @@
 #define MOZC_COMPOSER_CHAR_CHUNK_H_
 
 #include <cstddef>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <utility>

src/composer/composition.h

@@ -32,7 +32,9 @@
 
 #include <cstddef>
 #include <list>
+#include <memory>
 #include <string>
+#include <tuple>
 #include <utility>
 
 #include "absl/container/btree_set.h"
@@ -41,8 +43,8 @@
 #include "absl/strings/str_join.h"
 #include "composer/char_chunk.h"
 #include "composer/composition_input.h"
-#include "composer/transliterators.h"
 #include "composer/table.h"
+#include "composer/transliterators.h"
 
 namespace mozc {
 namespace composer {

src/converter/BUILD.bazel

@@ -33,6 +33,7 @@ load(
     "mozc_cc_library",
     "mozc_cc_test",
     "mozc_py_binary",
+    "mozc_select",
     "mozc_select_enable_supplemental_model",
 )
 load("//bazel:stubs.bzl", "bzl_library")
@@ -174,8 +175,6 @@ mozc_cc_library(
     deps = [
         "//data_manager",
         "//storage/louds:simple_succinct_bit_vector_index",
-        "@com_google_absl//absl/algorithm:container",
-        "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -200,6 +199,7 @@ mozc_cc_test(
         "//testing:mozctest",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings:string_view",
     ],
 )
 
@@ -290,13 +290,11 @@ mozc_cc_test(
         ":segments",
         "//base/container:freelist",
         "//data_manager/testing:mock_data_manager",
-        "//dictionary:dictionary_interface",
         "//dictionary:dictionary_mock",
         "//dictionary:pos_matcher",
         "//prediction:suggestion_filter",
         "//protocol:commands_cc_proto",
         "//request:conversion_request",
-        "//request:request_test_util",
         "//testing:gunit_main",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
@@ -333,6 +331,7 @@ mozc_cc_library(
         ":node_allocator",
         "//base:singleton",
         "//base/strings:unicode",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/strings",
     ],
@@ -395,6 +394,7 @@ mozc_cc_library(
         "//protocol:config_cc_proto",
         "//request:conversion_request",
         "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:check",
@@ -706,6 +706,41 @@ mozc_cc_binary(
     ]),
 )
 
+mozc_cc_binary(
+    name = "immutable_converter_main",
+    testonly = True,
+    srcs = ["immutable_converter_main.cc"],
+    deps = [
+        ":immutable_converter_no_factory",
+        ":lattice",
+        ":node",
+        ":segments",
+        "//base:file_stream",
+        "//base:file_util",
+        "//base:init_mozc",
+        "//base:number_util",
+        "//base:system_util",
+        "//base/container:flat_set",
+        "//data_manager",
+        "//data_manager/oss:oss_data_manager",
+        "//data_manager/testing:mock_data_manager",
+        "//engine:modules",
+        "//request:conversion_request",
+        "@com_google_absl//absl/base:nullability",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
+    ] + mozc_select(
+        default = [
+            "//data_manager/android:android_data_manager",
+            "//data_manager/google:google_data_manager",
+        ],
+        oss = [],
+    ),
+)
+
 mozc_cc_library(
     name = "gen_segmenter_bitarray",
     srcs = ["gen_segmenter_bitarray.cc"],

src/converter/candidate.h

@@ -34,6 +34,7 @@
 #include <cstdint>
 #include <ostream>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include "absl/strings/string_view.h"