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

Author: Fcitx Bot

src/base/win32/com.h

@@ -145,7 +145,6 @@ inline wil::unique_bstr MakeUniqueBSTR(const wchar_t *source) {
 // Note: this behavior is different from IUnknown methods. Check COM interface
 // documentation to make sure the returned error codes are correct.
 template <typename T, typename U>
-  requires std::integral<T> && std::integral<U>
 HResult SaveToOutParam(T value, U *absl_nullable out);
 template <typename T, typename U>
 HResult SaveToOutParam(T *absl_nullable value, U **absl_nullable out);
@@ -169,7 +168,6 @@ void SaveToOptionalOutParam(T value, U *absl_nullable out);
 // Implementations.
 
 template <typename T, typename U>
-  requires std::integral<T> && std::integral<U>
 HResult SaveToOutParam(T value, U *absl_nullable out) {
   static_assert(std::convertible_to<T, U>);
   if (out == nullptr) {

src/converter/BUILD.bazel

@@ -108,6 +108,7 @@ mozc_cc_library(
         "//engine:__pkg__",
         "//prediction:__pkg__",
         "//rewriter:__pkg__",
+        "//session:__pkg__",
     ],
 )
 
@@ -411,6 +412,7 @@ mozc_cc_library(
     deps = [
         ":segments",
         "//request:conversion_request",
+        "@com_google_absl//absl/base:core_headers",
     ],
 )
 
@@ -731,6 +733,7 @@ mozc_cc_binary(
         "//engine:eval_engine_data",
     ],
     deps = [
+        ":attribute",
         ":converter_interface",
         ":lattice",
         ":pos_id_printer",

src/converter/attribute.h

@@ -38,8 +38,7 @@ namespace converter {
 // explicit casting.
 class Attribute {
  public:
-  // TODO(taku): Can use unnamed enum after full migration.
-  enum Attribute_ {
+  enum {
     DEFAULT_ATTRIBUTE = 0,
     // this was the best candidate before learning
     BEST_CANDIDATE = 1 << 0,

src/converter/candidate.h

@@ -37,7 +37,6 @@
 #include <tuple>
 #include <vector>
 
-#include "absl/base/attributes.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "base/number_util.h"
@@ -63,11 +62,6 @@ class Candidate {
  public:
   Candidate() = default;
 
-  // Allows to refer Attribute via Candidate::XXX
-  // TODO(taku): Remove this alias after full migration.
-  using Attribute = converter::Attribute::Attribute_;
-  using enum converter::Attribute::Attribute_;
-
   enum Command {
     DEFAULT_COMMAND = 0,
     ENABLE_INCOGNITO_MODE,      // enables "incognito mode".
@@ -170,11 +164,6 @@ class Candidate {
   // value.substr(content_value.size(), value.size() - content_value.size());
   absl::string_view functional_value() const;
 
-  // inner_segments() always returns valid information, so
-  // IsValid() can return always true.
-  // TODO(taku): Remove this method.
-  ABSL_DEPRECATED("IsValid() always returns true.")
-  bool IsValid() const { return true; }
   std::string DebugString() const;
 
   friend std::ostream &operator<<(std::ostream &os,

src/converter/candidate_test.cc

@@ -42,26 +42,8 @@ namespace converter {
 
 TEST(CandidateTest, IsValid) {
   Candidate c;
-  EXPECT_TRUE(c.IsValid());
-
   c.key = "key";
   c.value = "value";
-  c.content_key = "content_key";
-  c.content_value = "content_value";
-  c.prefix = "prefix";
-  c.suffix = "suffix";
-  c.description = "description";
-  c.usage_title = "usage_title";
-  c.usage_description = "usage_description";
-  c.cost = 1;
-  c.wcost = 2;
-  c.structure_cost = 3;
-  c.lid = 4;
-  c.rid = 5;
-  c.attributes = 6;
-  c.style = NumberUtil::NumberString::NUMBER_CIRCLED;
-  c.command = Candidate::DISABLE_PRESENTATION_MODE;
-  EXPECT_TRUE(c.IsValid());  // Empty inner_segment_boundary
 
   // Valid inner_segment_boundary.
   EXPECT_FALSE(