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

fcitx · Jul 2, 2024 · 8ae324e · 8ae324e
2 parents b41c287 + 431ed8e
commit 8ae324e
Show file tree

Hide file tree

Showing 18 changed files with 200 additions and 297 deletions.
diff --git a/docs/build_mozc_in_osx.md b/docs/build_mozc_in_osx.md
@@ -87,7 +87,7 @@ python build_tools/update_deps.py
 In this step, additional build dependencies will be downloaded.
 
   * [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-mac.zip)
-  * [Qt 6.7.1](https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz)
+  * [Qt 6.7.2](https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz)
   * [git submodules](../.gitmodules)
 
 You can specify `--noqt` option if you would like to use your own Qt binaries.

diff --git a/docs/build_mozc_in_windows.md b/docs/build_mozc_in_windows.md
@@ -65,7 +65,7 @@ python build_tools/update_deps.py
 In this step, additional build dependencies will be downloaded.
 
   * [Ninja 1.11.0](https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip)
-  * [Qt 6.7.1](https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz)
+  * [Qt 6.7.2](https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz)
   * [.NET tools](../dotnet-tools.json)
   * [git submodules](../.gitmodules)
 

diff --git a/src/base/container/BUILD.bazel b/src/base/container/BUILD.bazel
@@ -57,7 +57,10 @@ mozc_cc_library(
     name = "freelist",
     hdrs = ["freelist.h"],
     visibility = ["//:__subpackages__"],
-    deps = ["//testing:friend_test"],
+    deps = [
+        "//testing:friend_test",
+        "@com_google_absl//absl/base:nullability",
+    ],
 )
 
 mozc_cc_test(

diff --git a/src/base/container/freelist.h b/src/base/container/freelist.h
@@ -37,6 +37,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/base/nullability.h"
 #include "testing/friend_test.h"
 
 namespace mozc {
@@ -96,7 +97,7 @@ class FreeList {
     next_in_chunk_ = std::numeric_limits<size_type>::max();
   }
 
-  T* Alloc() {
+  absl::Nonnull<T*> Alloc() {
     if (next_in_chunk_ >= chunk_size_) {
       next_in_chunk_ = 0;
       // Allocate the chunk with the allocate and delay the constructions until
@@ -105,7 +106,7 @@ class FreeList {
     }
 
     // Default construct T.
-    T* ptr = pool_.back() + next_in_chunk_++;
+    absl::Nonnull<T*> ptr = pool_.back() + next_in_chunk_++;
     allocator_traits::construct(allocator_, ptr);
     return ptr;
   }

diff --git a/src/build_tools/build_qt.py b/src/build_tools/build_qt.py
@@ -37,7 +37,7 @@
 
 By default, this script assumes that Qt archives are stored as
 
-  src/third_party_cache/qtbase-everywhere-src-6.6.3.tar.xz
+  src/third_party_cache/qtbase-everywhere-src-6.7.2.tar.xz
 
 and Qt src files that are necessary to build Mozc will be checked out into
 
@@ -69,7 +69,7 @@
 ABS_QT_DEST_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'qt')
 # The archive filename should be consistent with update_deps.py.
 ABS_QT6_ARCHIVE_PATH = ABS_MOZC_SRC_DIR.joinpath(
-    'third_party_cache', 'qtbase-everywhere-src-6.7.1.tar.xz')
+    'third_party_cache', 'qtbase-everywhere-src-6.7.2.tar.xz')
 ABS_DEFAULT_NINJA_DIR = ABS_MOZC_SRC_DIR.joinpath('third_party', 'ninja')
 
 

diff --git a/src/build_tools/update_deps.py b/src/build_tools/update_deps.py
@@ -81,9 +81,9 @@ def __hash__(self):
 
 
 QT6 = ArchiveInfo(
-    url='https://download.qt.io/archive/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz',
-    size=49324536,
-    sha256='b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19',
+    url='https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz',
+    size=49364504,
+    sha256='c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599',
 )
 
 NINJA_MAC = ArchiveInfo(

diff --git a/src/converter/BUILD.bazel b/src/converter/BUILD.bazel
@@ -187,9 +187,11 @@ mozc_cc_library(
         "//dictionary:suppression_dictionary",
         "//prediction:suggestion_filter",
         "//request:conversion_request",
+        "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:span",
     ],
 )