Skip to content

Commit

Permalink
Merge pull request #64 from atsams-rs/issue/62/fix-glob-reexport-warn…
Browse files Browse the repository at this point in the history
…ings

[Fixes #62] Remove re-exports to avoid warnings promoted to errors

Approved verbally by @martinmortsell
  • Loading branch information
michalfita authored Oct 10, 2023
2 parents c257e21 + 2d75357 commit 8a1d6d7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:

jobs:
setup:
if: github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
steps:
- name: Checkout sources
Expand All @@ -24,6 +25,7 @@ jobs:
feature_matrix: ${{ steps.features.outputs.feature_matrix }}

build:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: setup
runs-on: ubuntu-latest
strategy:
Expand All @@ -39,7 +41,28 @@ jobs:
- name: Build HAL for ${{ matrix.pac }}
run: cargo check --package atsamx7x-hal --features ${{ matrix.pac }},unproven

build-latest:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: setup
runs-on: ubuntu-latest
strategy:
matrix:
pac: ${{ fromJson(needs.setup.outputs.pac_matrix) }}
continue-on-error: true # we let this fail and carry on, but GH UI is poor not showing amber like other CIs
steps:
- name: Checkout sources
uses: actions/checkout@v2
- name: Update toolchain
run: rustup update
- name: Specify toolchain
run: rustup override set stable
- name: Install Rust (thumbv7em)
run: rustup target add thumbv7em-none-eabihf
- name: Build HAL for ${{ matrix.pac }}
run: cargo check --package atsamx7x-hal --features ${{ matrix.pac }},unproven

build-features:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: setup
runs-on: ubuntu-latest
strategy:
Expand All @@ -56,6 +79,7 @@ jobs:
run: cargo check --package atsamx7x-hal --features ${{ matrix.features }},samv71q21b,unproven

board-examples:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: setup
runs-on: ubuntu-latest
strategy:
Expand All @@ -74,6 +98,7 @@ jobs:
cargo check --examples
clippy-hal:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: build
runs-on: ubuntu-latest
steps:
Expand All @@ -89,6 +114,7 @@ jobs:
run: cargo clippy --package atsamx7x-hal --no-deps --features samv71q21b,unproven,reconfigurable-system-pins -- --deny warnings

clippy-examples:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: [setup, build, board-examples]
runs-on: ubuntu-latest
strategy:
Expand All @@ -109,6 +135,7 @@ jobs:
cargo clippy --examples --no-deps -- --deny warnings
docs:
if: github.event.pull_request.head.repo.full_name != github.repository
needs: build
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

### Added

- [Integration](https://crates.io/crates/mcan-core) with the
[`mcan`](https://crates.io/crates/mcan) crate.
- [Integration](https://crates.io/crates/mcan-core) with the [`mcan`](https://crates.io/crates/mcan) crate.
- Implementation of blocking::i2c::Transactional trait from [embedded-hal](https://crates.io/crates/embedded-hal) for TWI device.

### Changed
Expand All @@ -15,6 +14,7 @@
### Removed

### Fixed
- [#62] Remove ambiguous reexports from `src/serial/mod.rs`.
- TWIHS: Fix issue with clock frequency calculation.

## [v0.4.2] 2022-11-06
Expand Down
4 changes: 0 additions & 4 deletions hal/src/serial/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@ impl ExtBpsU32 for u32 {
}

pub mod uart;
pub use uart::*;

pub mod usart;
pub use usart::*;

pub mod twi;
pub use twi::*;

#[cfg(not(feature = "pins-64"))]
pub mod spi;
#[cfg(not(feature = "pins-64"))]
pub use spi::*;
2 changes: 1 addition & 1 deletion hal/src/serial/usart/uart.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::ehal::{self, blocking};
pub enum UartError {
/// A frame's stop bit was read as zero.
Framing,
/// Parity check of the recived frame failed.
/// Parity check of the received frame failed.
Parity,
/// A word was received before the previous word was read.
Overrun,
Expand Down

0 comments on commit 8a1d6d7

Please sign in to comment.