Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to embedded-hal-1.0.0-alpha.1 #43

Merged
merged 1 commit into from
Nov 7, 2020

Conversation

eldruin
Copy link
Member

@eldruin eldruin commented Jun 17, 2020

I adapted this to the embedded-hal-1.0.0-alpha.1 release.
As part of it I also replaced void with core::convert::Infallible.

(blocked on rust-embedded/embedded-hal#177)

@eldruin eldruin requested a review from a team as a code owner June 17, 2020 13:11
@rust-highfive
Copy link

r? @ryankurte

(rust_highfive has picked a reviewer for you, use r? to override)

@reneherrero
Copy link

reneherrero commented Aug 16, 2020

Curious as to what's holding this back?

Reason I'm asking is I'm trying to submit a PR to add Controller Area Network (CAN) support. The changes in this PR would help me do so as I'm referencing another PR that implements the CAN traits and is a fork off embedded-hal 1.0.0-alpha.1.

If something is preventing these changes from going to master, would it perhaps be possible to push them to another branch?

Thanks

@ryankurte
Copy link
Contributor

hey, this is unlikely to land until the upstream embedded-hal release so we can keep applying changes if required to the current release. you should be able to pull eldruin's changes into your branch with something like: git pull https://github.com/eldruin/linux-embedded-hal.git embedded-hal-1.0.0-alpha.1 so your PR depends on this one if this would work for you?

@reneherrero
Copy link

Yeah, I did contemplate that thought, was just hesitant to go that route as my PR would include another PR's changes which seemed a little bit funky as you would have the same changes in two places.

I figured that if you where good with the changes here, you might prefer having a v1.0.0 branch here, ie have a vNext branch and allow folks to PR into that and keep master for any hot fixes that might come up.

Multiple ways to skin the cat, it's your house, I'll go whichever route you like

@ryankurte
Copy link
Contributor

hey @posborne how would you feel about doing a maintenance / alpha split like we have with e-h?
(branch for backporting fixes / changes to previous releases, pull master up to a new alpha release?)

@posborne
Copy link
Member

hey @posborne how would you feel about doing a maintenance / alpha split like we have with e-h?
(branch for backporting fixes / changes to previous releases, pull master up to a new alpha release?)

@ryankurte That seems reasonable to me.

bors bot added a commit that referenced this pull request Nov 3, 2020
48: Adapt to embedded-hal-1.0.0-alpha.2 r=ryankurte a=eldruin

Builds on and superseeds #43 

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
@eldruin eldruin mentioned this pull request Nov 4, 2020
bors bot added a commit that referenced this pull request Nov 5, 2020
50: Embedded hal 1.0.0 alpha.3 r=ryankurte a=eldruin

Builds on and superseeds #43 and #48.

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
bors bot added a commit that referenced this pull request Nov 7, 2020
50: Embedded hal 1.0.0 alpha.3 r=ryankurte a=eldruin

Builds on and superseeds #43 and #48.

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
@bors bors bot merged commit 0df951c into rust-embedded:master Nov 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Review is incomplete T-embedded-linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants