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

transpile: remove git-testament dependency (for now) to remove time dependency to build on 1.80.0 #1115

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 0 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions c2rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,11 @@ azure-devops = { project = "immunant/c2rust", pipeline = "immunant.c2rust", buil
anyhow = "1.0"
clap = { version = "3.2.22", features = ["yaml", "cargo", "derive"] }
env_logger = "0.10"
git-testament = "0.2.1"
is_executable = "1.0"
log = "0.4"
regex = "1.3"
shlex = "1.3"
c2rust-transpile = { version = "0.18.0", path = "../c2rust-transpile" }
# Required to avoid too-new version (dep of git-testament) which our rustc cannot compile
time-macros = "=0.2.6"

[build-dependencies]
c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.18.0" }
Expand Down
5 changes: 1 addition & 4 deletions c2rust/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use anyhow::anyhow;
use clap::{crate_authors, App, AppSettings, Arg};
use git_testament::{git_testament, render_testament};
use is_executable::IsExecutable;
use std::borrow::Cow;
use std::collections::HashMap;
Expand All @@ -11,8 +10,6 @@ use std::process;
use std::process::Command;
use std::str;

git_testament!(TESTAMENT);

/// A `c2rust` sub-command.
struct SubCommand {
/// The path to the [`SubCommand`]'s executable,
Expand Down Expand Up @@ -124,7 +121,7 @@ fn main() -> anyhow::Result<()> {

// If we didn't get a subcommand, then use `clap` for parsing and error/help messages.
let matches = App::new("C2Rust")
.version(&*render_testament!(TESTAMENT))
.version(env!("CARGO_PKG_VERSION"))
.author(crate_authors!(", "))
.settings(&[AppSettings::SubcommandRequiredElseHelp])
.subcommands(sub_commands.keys().map(|name| {
Expand Down
Loading