Skip to content

Commit 13e151c

Browse files
authored
Merge pull request #556 from rust-embedded/migrating-typos
Fix a couple of typos in migration guide
2 parents af78104 + 009ccf8 commit 13e151c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

MIGRATING-0.2-1.0.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ and we can add them back in a future 1.x release.
120120
### Impractical traits
121121

122122
The [`digital::IoPin` trait][iopin] and the [`adc` traits][adc] have been deemed impractical for use and have thus been removed.
123-
Please feel free to comment on the appropriate issue if you need any of these traitsk and propose a solution.
123+
Please feel free to comment on the appropriate issue if you need any of these traits and propose a solution.
124124

125125
### Serial traits
126126

@@ -158,7 +158,7 @@ When upgrading code to `embedded-hal` 1.0, it is critical to implement/use the r
158158
- Optionally, if the API *does* manage a CS pin automatically, you may implement `SpiDevice`.
159159
- This is required if the underlying API requires it to manage the CS pin, like `spidev` on Linux.
160160

161-
Do not implement `SpiBus` and `SpiDevice` on the same struct, since this is never correct. When there's no CS pin being controlled you must implement only `SpiBus`, and when there is, implement only `SpiDevice`. If you want to offer both APIs, implement them on separate structs so the user has to cohose one or the other.
161+
Do not implement `SpiBus` and `SpiDevice` on the same struct, since this is never correct. When there's no CS pin being controlled you must implement only `SpiBus`, and when there is, implement only `SpiDevice`. If you want to offer both APIs, implement them on separate structs so the user has to choose one or the other.
162162

163163
### For driver crates
164164

@@ -335,7 +335,7 @@ the same across traits.
335335
To overcome this, please import the traits you wish to use individually.
336336

337337
If you run into ambiguous method calls, you can disambiguate using the fully-qualified syntax (the error message
338-
from the compiler should already tell you how it should look like in your case) or tweak your trait imports or code
338+
from the compiler should already tell you how it should look in your case) or tweak your trait imports or code
339339
to limit the scope of the trait imports and thus avoid the ambiguity.
340340
Please note that it is also possible to import traits *inside a function*.
341341

0 commit comments

Comments
 (0)