Skip to content

Commit

Permalink
Small fixes before releasing stable (#50)
Browse files Browse the repository at this point in the history
One of our deps (`[email protected]`) had been yanked, so bumped it. Also
found some other `cargo deny` issues so the whole CLI component from
duplicate version detection since it's not going to be a problem for
"downstream integrations".
  • Loading branch information
tgolsson authored Oct 9, 2023
1 parent 7f6509f commit 14d9b55
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/cervo-cli/src/commands/to_nnef.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub(super) fn onnx_to_nnef(config: ToNnefArgs) -> Result<()> {
} = config;

match in_file.extension().and_then(|ext| ext.to_str()) {
Some(ext) if ext == "onnx" => {}
Some("onnx") => {}
Some(ext) => bail!("unexpected extension: {:?}", ext),
None => bail!("file without extension: {:?}", in_file),
}
Expand All @@ -71,7 +71,7 @@ pub(super) fn onnx_to_nnef(config: ToNnefArgs) -> Result<()> {
pub(super) fn batch_onnx_to_nnef(config: BatchToNnefArgs) -> Result<()> {
for file in &config.in_files {
match file.extension().and_then(|ext| ext.to_str()) {
Some(ext) if ext == "onnx" => {}
Some("onnx") => {}
Some(ext) => bail!("unexpected extension: {:?}", ext),
None => bail!("file without extension: {:?}", file),
}
Expand Down
4 changes: 2 additions & 2 deletions crates/cervo-runtime/src/runtime/ticket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ impl Eq for Ticket {}

impl PartialOrd for Ticket {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
other.0.partial_cmp(&self.0)
Some(self.cmp(other))
}
}

impl Ord for Ticket {
fn cmp(&self, other: &Ticket) -> Ordering {
self.partial_cmp(other).unwrap()
other.0.cmp(&self.0)
}
}

Expand Down
2 changes: 1 addition & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ skip = [
# dependencies starting at the specified crate, up to a certain depth, which is
# by default infinite
skip-tree = [
#{ name = "ansi_term", version = "=0.11.0", depth = 20 },
{ name = "cervo-cli", depth = 20 },
]

# This section is considered when running `cargo deny check sources`.
Expand Down
1 change: 1 addition & 0 deletions release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ pre-release-commit-message = "Release {{version}}"
tag-message = "Release {{version}}"
tag-name = "{{version}}"
consolidate-commits = true
shared-version = true

0 comments on commit 14d9b55

Please sign in to comment.