Skip to content

Commit

Permalink
chore: update CI to rustc 1.78
Browse files Browse the repository at this point in the history
  • Loading branch information
godzie44 committed May 12, 2024
1 parent e2fb4c0 commit c490d4a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 15 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,27 @@ jobs:
test:
strategy:
matrix:
rustc_version: [ 1.75.0, 1.76.0, 1.77.0, 1.78.0 ]
rustc_sup_version: [ 1.75.0, 1.76.0, 1.77.0, 1.78.0 ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rustc_version }}
override: true
components: rustfmt, clippy
- name: Install libunwind and debug symbols
run: |
sudo apt-get update
sudo apt-get install libunwind-dev libc6-dbg
- name: Build debugger and test programs
- name: Install rustc for test applications
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rustc_sup_version }}
override: true
components: rustfmt, clippy
- name: Build test applications
run: make build-all
- name: Install actual rustc
uses: actions-rs/toolchain@v1
with:
toolchain: 1.78.0
components: rustfmt, clippy
- name: Run functional tests on own stack unwind implementation
run: make cargo-test-no-libunwind
- name: Run functional tests
Expand All @@ -31,13 +36,12 @@ jobs:

integration-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.76.0
toolchain: 1.78.0
override: true
components: rustfmt, clippy
- name: Set up Python 3.7
Expand All @@ -64,7 +68,7 @@ jobs:
- name: Install rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.76.0
toolchain: 1.78.0
override: true
components: rustfmt, clippy
- name: Install libunwind
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ build:
build-test:
cargo build --features "int_test"

build-all: build
build-examples:
cd examples ; cargo build -p calc_lib ; cargo build

build-all: build build-examples

cargo-test:
cargo test --features "int_test"

Expand Down
2 changes: 1 addition & 1 deletion src/debugger/debugee/dwarf/type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ impl TypeParser {

fn parse_inner<T>(&mut self, ctx_die: ContextualDieRef<'_, T>, type_ref: DieRef) {
// guard from recursion types parsing
if self.known_type_ids.get(&type_ref).is_some() {
if self.known_type_ids.contains(&type_ref) {
return;
}
self.known_type_ids.insert(type_ref);
Expand Down
6 changes: 4 additions & 2 deletions src/debugger/debugee/dwarf/unit/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,13 @@ impl FunctionDie {
pub fn complete_from_decl(&mut self, declaration: &FunctionDie) {
if self.linkage_name.is_none() {
self.namespace = declaration.namespace.clone();
self.linkage_name = declaration.linkage_name.clone();
self.linkage_name.clone_from(&declaration.linkage_name);
}

if self.base_attributes.name.is_none() {
self.base_attributes.name = declaration.base_attributes.name.clone();
self.base_attributes
.name
.clone_from(&declaration.base_attributes.name);
}

if self.decl_file_line.is_none() {
Expand Down

0 comments on commit c490d4a

Please sign in to comment.