Skip to content

Commit 16517e3

Browse files
committed
added cargo.lock
1 parent 1f9ac6f commit 16517e3

File tree

4 files changed

+201
-12
lines changed

4 files changed

+201
-12
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
debug/
44
target/
55

6-
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
7-
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
8-
Cargo.lock
9-
106
# These are backup files generated by rustfmt
117
**/*.rs.bk
128

Cargo.lock

Lines changed: 191 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-ament-build"
33
version = "0.1.9"
44
authors = ["Nikolai Morin <[email protected]>"]
5-
edition = "2021"
5+
edition = "2024"
66
license = "Apache-2.0"
77
description = "Cargo plugin for use with colcon workspaces"
88
repository = "https://github.com/ros2-rust/cargo-ament-build"
@@ -13,9 +13,9 @@ keywords = ["ros2", "colcon", "ament"]
1313
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1414

1515
[dependencies]
16-
anyhow = "1"
17-
cargo-manifest = "0.17"
18-
pico-args = "0.4"
16+
anyhow = "1.0.98"
17+
cargo-manifest = "0.19.1"
18+
pico-args = "0.5.0"
1919

2020
# The profile that 'cargo dist' will build with
2121
[profile.dist]
@@ -35,4 +35,4 @@ targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown
3535

3636
[workspace.metadata.dist.github-custom-runners]
3737
aarch64-unknown-linux-gnu = "buildjet-8vcpu-ubuntu-2204-arm"
38-
aarch64-unknown-linux-musl = "buildjet-8vcpu-ubuntu-2204-arm"
38+
aarch64-unknown-linux-musl = "buildjet-8vcpu-ubuntu-2204-arm"

src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Licensed under the Apache License, Version 2.0
22

3-
use anyhow::{anyhow, bail, Context, Result};
3+
use anyhow::{Context, Result, anyhow, bail};
44
use cargo_manifest::{Manifest, Product, StringOrBool, Value};
55

66
use std::ffi::OsString;
@@ -86,7 +86,9 @@ impl ArgsOrHelp {
8686

8787
pub fn print_help() {
8888
println!("cargo-ament-build");
89-
println!("Wrapper around cargo-build that installs compilation results and extra files to an ament/ROS 2 install space.\n");
89+
println!(
90+
"Wrapper around cargo-build that installs compilation results and extra files to an ament/ROS 2 install space.\n"
91+
);
9092
println!("USAGE:");
9193
println!(" cargo ament-build --install-base <INSTALL_DIR> -- <CARGO-BUILD-OPTIONS>");
9294
}
@@ -146,7 +148,7 @@ fn copy(src: impl AsRef<Path>, dest_dir: impl AsRef<Path>) -> Result<()> {
146148
}
147149
}
148150
} else if src.is_file() {
149-
std::fs::copy(&src, &dest).with_context(|| {
151+
std::fs::copy(src, &dest).with_context(|| {
150152
format!(
151153
"Failed to copy '{}' to '{}'.",
152154
src.display(),

0 commit comments

Comments
 (0)