Skip to content

Commit 5cf2ee9

Browse files
committed
fmt, fix ubuntu-old, add some debug info for the current ubuntu
1 parent c40edf2 commit 5cf2ee9

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
os: ubuntu-latest
2121
rust: stable
2222
- build: ubuntu-old
23-
os: ubuntu-18.04
23+
os: ubuntu-20.04
2424
rust: stable
2525
- build: macos
2626
os: macos-latest
@@ -29,6 +29,7 @@ jobs:
2929
- uses: actions/checkout@v1
3030
- name: Install Rust (rustup)
3131
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
32+
- run: clang --version
3233
- run: cargo test
3334

3435
lint:

protobuf-native/src/compiler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#pragma once
1717

1818
#include "google/protobuf/compiler/importer.h"
19-
2019
#include "rust/cxx.h"
2120

2221
namespace protobuf_native {

protobuf-native/src/io.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
#pragma once
1717

18+
#include <memory>
19+
1820
#include "google/protobuf/io/coded_stream.h"
1921
#include "google/protobuf/io/zero_copy_stream.h"
2022
#include "google/protobuf/io/zero_copy_stream_impl.h"
2123
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
22-
23-
#include <memory>
24-
2524
#include "rust/cxx.h"
2625

2726
namespace protobuf_native {

protobuf-native/src/lib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
#pragma once
1717

18+
#include <memory>
19+
1820
#include "google/protobuf/descriptor.h"
1921
#include "google/protobuf/descriptor.pb.h"
2022

21-
#include <memory>
22-
2323
using namespace google::protobuf;
2424

2525
namespace protobuf_native {

0 commit comments

Comments
 (0)