diff --git a/src/gn/header_checker.cc b/src/gn/header_checker.cc index 344c85ad..97ea8b99 100644 --- a/src/gn/header_checker.cc +++ b/src/gn/header_checker.cc @@ -288,7 +288,7 @@ std::vector HeaderChecker::FilesToCheck( } // All generated files, including action outputs, are in the output dir. - const bool in_output_dir = IsFileInOuputDir(info.file); + const bool in_output_dir = IsFileInOutputDir(info.file); TargetVector targets_to_check; for (const auto& vect_i : info.targets) { @@ -383,7 +383,7 @@ void HeaderChecker::AddTargetToFileMap(const Target* target, FileMap* dest) { } } -bool HeaderChecker::IsFileInOuputDir(const SourceFile& file) const { +bool HeaderChecker::IsFileInOutputDir(const SourceFile& file) const { const std::string& build_dir = build_settings_->build_dir().value(); return file.value().starts_with(build_dir); } @@ -530,7 +530,7 @@ bool HeaderChecker::CheckFile(const TargetVector& targets, // target. These won't exist at checking time. Since we require all generated // files to be somewhere in the output tree, we can just check the name to // see if they should be skipped. - if (!check_generated_ && IsFileInOuputDir(file)) + if (!check_generated_ && IsFileInOutputDir(file)) return true; base::FilePath path = build_settings_->GetFullPath(file); @@ -538,7 +538,7 @@ bool HeaderChecker::CheckFile(const TargetVector& targets, if (!base::ReadFileToString(path, &contents)) { // A missing (not yet) generated file is an acceptable problem // considering this code does not understand conditional includes. - if (IsFileInOuputDir(file)) + if (IsFileInOutputDir(file)) return true; for (const TargetInfo& from_target_info : targets) { diff --git a/src/gn/header_checker.h b/src/gn/header_checker.h index 51b12f46..14f4eaf7 100644 --- a/src/gn/header_checker.h +++ b/src/gn/header_checker.h @@ -300,7 +300,7 @@ class HeaderChecker : public base::RefCountedThreadSafe { static void AddTargetToFileMap(const Target* target, FileMap* dest); // Returns true if the given file is in the output directory. - bool IsFileInOuputDir(const SourceFile& file) const; + bool IsFileInOutputDir(const SourceFile& file) const; // Resolves the contents of an include to a SourceFile. SourceFile SourceFileForInclude(const IncludeStringWithLocation& include, diff --git a/src/gn/substitution_writer.h b/src/gn/substitution_writer.h index 95e4b94a..e4f26592 100644 --- a/src/gn/substitution_writer.h +++ b/src/gn/substitution_writer.h @@ -82,7 +82,7 @@ class SubstitutionWriter { // as either a string, a SourceFile or an OutputFile. If the result is // expected to be a SourceFile or an OutputFile, this will CHECK if the // result isn't in the correct directory. The caller should validate this - // first (see for example IsFileInOuputDir). + // first (see for example IsFileInOutputDir). // // The target can be null (see class comment above). static SourceFile ApplyPatternToSource(const Target* target, diff --git a/src/gn/target_unittest.cc b/src/gn/target_unittest.cc index 5518761e..f36f7f26 100644 --- a/src/gn/target_unittest.cc +++ b/src/gn/target_unittest.cc @@ -606,7 +606,7 @@ TEST_F(TargetTest, RustLinkAndDepOutputs) { // solink tools. // // Also tests GetOutputsAsSourceFiles() for binaries (the setup is the same). -TEST_F(TargetTest, RuntimeOuputs) { +TEST_F(TargetTest, RuntimeOutputs) { TestWithScope setup; Err err; @@ -659,7 +659,7 @@ TEST_F(TargetTest, RuntimeOuputs) { EXPECT_EQ("//out/Debug/a.pdb", computed_outputs[2].value()); } -TEST_F(TargetTest, RustRuntimeOuputs) { +TEST_F(TargetTest, RustRuntimeOutputs) { TestWithScope setup; Err err;