Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ jobs:
matrix:
build:
- ubuntu
- ubuntu-old
- macos
include:
- build: ubuntu
os: ubuntu-latest
rust: stable
- build: ubuntu-old
os: ubuntu-18.04
os: ubuntu-20.04
rust: stable
- build: macos
os: macos-latest
Expand Down
3 changes: 1 addition & 2 deletions protobuf-native/src/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

#pragma once

#include <google/protobuf/compiler/importer.h>

#include "google/protobuf/compiler/importer.h"
#include "rust/cxx.h"

namespace protobuf_native {
Expand Down
2 changes: 1 addition & 1 deletion protobuf-native/src/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#pragma once

#include <absl/strings/string_view.h>
#include "absl/strings/string_view.h"

namespace protobuf_native {
namespace internal {
Expand Down
9 changes: 4 additions & 5 deletions protobuf-native/src/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@

#pragma once

#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/io/zero_copy_stream_impl.h>
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>

#include <memory>

#include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/io/zero_copy_stream.h"
#include "google/protobuf/io/zero_copy_stream_impl.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include "rust/cxx.h"

namespace protobuf_native {
Expand Down
6 changes: 3 additions & 3 deletions protobuf-native/src/lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

#pragma once

#include <google/protobuf/descriptor.h>
#include <google/protobuf/descriptor.pb.h>

#include <memory>

#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"

using namespace google::protobuf;

namespace protobuf_native {
Expand Down