Internal changes

PiperOrigin-RevId: 544398743
pull/13174/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent 07c702e7b5
commit 272ec6bc12
  1. 1
      src/google/protobuf/compiler/allowlists/BUILD.bazel
  2. 3
      src/google/protobuf/compiler/allowlists/allowlists.h
  3. 51
      src/google/protobuf/compiler/allowlists/editions.cc
  4. 1
      src/google/protobuf/compiler/command_line_interface.h

@ -20,6 +20,7 @@ cc_library(
cc_library(
name = "allowlists",
srcs = [
"editions.cc",
"empty_package.cc",
"open_enum.cc",
"unused_imports.cc",

@ -52,6 +52,9 @@ bool IsOpenEnumMessage(absl::string_view msg);
// Returns whether a file can contain an unused import.
bool IsUnusedImportFile(absl::string_view file);
// Returns whether a file has early access to editions.
bool IsEarlyEditionsFile(absl::string_view file);
} // namespace compiler
} // namespace protobuf
} // namespace google

@ -0,0 +1,51 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "absl/strings/string_view.h"
#include "google/protobuf/compiler/allowlists/allowlist.h"
#include "google/protobuf/compiler/allowlists/allowlists.h"
namespace google {
namespace protobuf {
namespace compiler {
// NOTE: These files have early default access to go/editions. The protoc flag
// `--experimental_editions` can also be used to enable editions.
static constexpr auto kEarlyEditionsFile = internal::MakeAllowlist({
// Intentionally left blank.
});
bool IsEarlyEditionsFile(absl::string_view file) {
return kEarlyEditionsFile.Allows(file);
}
} // namespace compiler
} // namespace protobuf
} // namespace google

@ -428,6 +428,7 @@ class PROTOC_EXPORT CommandLineInterface {
// dependency file will be written. Otherwise, empty.
std::string dependency_out_name_;
// True if --include_imports was given, meaning that we should
// write all transitive dependencies to the DescriptorSet. Otherwise, only
// the .proto files listed on the command-line are added.

Loading…
Cancel
Save