aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <[email protected]>2024-02-09 10:15:15 +0200
committerPriit Laes <[email protected]>2024-02-09 10:15:53 +0200
commitcbdc49ef8d92606f917d1df0d88e4baef7bb23df (patch)
tree6aab6bd8d55ae8d4ad1f7267cf75bef851f3a8a0
parent6e2d54c40bfdb07b6bb28f5fd8009846d0695f67 (diff)
faq: embassy-time was split into three packages, update faq accordingly
I ran into this issue when I had to pull in embassy-nrf from git, though cargo didn't complain about conflicting embassy-time links.
-rw-r--r--docs/modules/ROOT/pages/faq.adoc9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/modules/ROOT/pages/faq.adoc b/docs/modules/ROOT/pages/faq.adoc
index c8695a01a..7fb81e2ca 100644
--- a/docs/modules/ROOT/pages/faq.adoc
+++ b/docs/modules/ROOT/pages/faq.adoc
@@ -124,15 +124,18 @@ You have multiple versions of the same crate in your dependency tree. This means
124embassy crates are coming from crates.io, and some from git, each of them pulling in a different set 124embassy crates are coming from crates.io, and some from git, each of them pulling in a different set
125of dependencies. 125of dependencies.
126 126
127To resolve this issue, make sure to only use a single source for all your embassy crates! To do this, 127To resolve this issue, make sure to only use a single source for all your embassy crates!
128you should patch your dependencies to use git sources using `[patch.crates.io]` and maybe `[patch.'https://github.com/embassy-rs/embassy.git']`. 128To do this, you should patch your dependencies to use git sources using `[patch.crates.io]`
129and maybe `[patch.'https://github.com/embassy-rs/embassy.git']`.
129 130
130Example: 131Example:
131 132
132[source,toml] 133[source,toml]
133---- 134----
134[patch.crates-io] 135[patch.crates-io]
135embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" } 136embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
137embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
138# embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" }
136---- 139----
137 140
138Note that the git revision should match any other embassy patches or git dependencies that you are using! 141Note that the git revision should match any other embassy patches or git dependencies that you are using!