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.

Sign up for GitHub

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

Refactor vendor dir #13

Merged
merged 8 commits into from
Aug 17, 2023
Merged

Refactor vendor dir #13

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea480f3
Refactor package installation / vendor dir setup
mara-schulke Aug 16, 2023
a51429b
Update code generation to invoke tonic a single time
mara-schulke Aug 16, 2023
5234fcc
Bump version
mara-schulke Aug 16, 2023
f30f936
Merge branch 'main' into mara/vendor-dir
mara-schulke Aug 16, 2023
e18f84d
Update generator.rs
mara-schulke Aug 17, 2023
e6a9a84
Update generator.rs
mara-schulke Aug 17, 2023
16fb682
Update package.rs
mara-schulke Aug 17, 2023
c3a2d3a
Apply suggestions
mara-schulke Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update package.rs 
Co-authored-by: Florian Eich <florian.eich@gmail.com>
  • Loading branch information
@mara-schulke @cdbrkfxrpt
mara-schulke and cdbrkfxrpt authored Aug 17, 2023
commit 16fb682cd0ffa543ea3a07dc12da2f2cceb4d176
2 changes: 1 addition & 1 deletion src/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl PackageStore {

eyre::ensure!(
existing.version == dependency.manifest.version,
"Another dependency in your project requires {}@{} which colides with {}@{} required by {}",
"A dependency of your project requires {}@{} which collides with {}@{} required by {}",
existing.name,
existing.version,
dependency.package,
Expand Down