Skip to content

Commit ff75a2f

Browse files
authored
refactor(cli)!: remove deprecations (#1777)
BREAKING CHANGE: Deprecated `Package` re-export from hugr-cli removed. BREAKING CHANGE: Deprecated `HugrArgs::get_package` removed.
1 parent 6f035d6 commit ff75a2f

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

hugr-cli/src/lib.rs

+1-17
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ pub mod extensions;
1414
pub mod mermaid;
1515
pub mod validate;
1616

17-
// TODO: Deprecated re-export. Remove on a breaking release.
18-
#[doc(inline)]
19-
#[deprecated(since = "0.13.2", note = "Use `hugr::package::Package` instead.")]
20-
pub use hugr::package::Package;
17+
use hugr::package::Package;
2118

2219
/// CLI arguments.
2320
#[derive(Parser, Debug)]
@@ -135,19 +132,6 @@ impl HugrArgs {
135132
}
136133
}
137134
}
138-
139-
/// Read either a package from the input.
140-
///
141-
/// deprecated: use [HugrArgs::get_package_or_hugr] instead.
142-
#[deprecated(
143-
since = "0.13.2",
144-
note = "Use `HugrArgs::get_package_or_hugr` instead."
145-
)]
146-
pub fn get_package(&mut self) -> Result<Package, CliError> {
147-
let val: serde_json::Value = serde_json::from_reader(&mut self.input)?;
148-
let pkg = serde_json::from_value::<Package>(val.clone())?;
149-
Ok(pkg)
150-
}
151135
}
152136

153137
/// Load a package or hugr from a seekable input.

hugr-cli/tests/validate.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use assert_cmd::Command;
88
use assert_fs::{fixture::FileWriteStr, NamedTempFile};
99
use hugr::builder::{DFGBuilder, DataflowSubContainer, ModuleBuilder};
10+
use hugr::package::Package;
1011
use hugr::types::Type;
1112
use hugr::{
1213
builder::{Container, Dataflow},
@@ -15,7 +16,7 @@ use hugr::{
1516
types::Signature,
1617
Hugr,
1718
};
18-
use hugr_cli::{validate::VALID_PRINT, Package};
19+
use hugr_cli::validate::VALID_PRINT;
1920
use predicates::{prelude::*, str::contains};
2021
use rstest::{fixture, rstest};
2122

0 commit comments

Comments
 (0)