* Related to #1547: use `dioxus-cli` within a workspace Although the `dx` CLI allows to specify a package name to chose from workspace members, it does not support workspace members specified as glob-wildcards. Neither it respects the effective package name, specified in the crate's `Cargo.toml`. This PR addresses that issue: - upon `dx build ...`, if the `--bin` CLI-argument is provided, treat the current dir as a workspace; - search through the workspace's `members`: resolve each of them with `glob`; - assume that any workspace member has a `Cargo.toml` in it (cargo does it, so it's okay); - read said manifest, and check the package name in it; - if found — there we have our sought package. * Use cargo-metadata to find out the workspace structure * glob is unused
87 lines
1.9 KiB
Rust
87 lines
1.9 KiB
Rust
use thiserror::Error as ThisError;
|
|
|
|
pub type Result<T, E = Error> = std::result::Result<T, E>;
|
|
|
|
#[derive(ThisError, Debug)]
|
|
pub enum Error {
|
|
/// Used when errors need to propogate but are too unique to be typed
|
|
#[error("{0}")]
|
|
Unique(String),
|
|
|
|
#[error("I/O Error: {0}")]
|
|
IO(#[from] std::io::Error),
|
|
|
|
#[error("Format Error: {0}")]
|
|
FormatError(#[from] std::fmt::Error),
|
|
|
|
#[error("Format failed: {0}")]
|
|
ParseError(String),
|
|
|
|
#[error("Runtime Error: {0}")]
|
|
RuntimeError(String),
|
|
|
|
#[error("Failed to write error")]
|
|
FailedToWrite,
|
|
|
|
#[error("Build Failed: {0}")]
|
|
BuildFailed(String),
|
|
|
|
#[error("Cargo Error: {0}")]
|
|
CargoError(String),
|
|
|
|
#[error("Couldn't retrieve cargo metadata")]
|
|
CargoMetadata(#[source] cargo_metadata::Error),
|
|
|
|
#[error("{0}")]
|
|
CustomError(String),
|
|
|
|
#[error("Invalid proxy URL: {0}")]
|
|
InvalidProxy(#[from] hyper::http::uri::InvalidUri),
|
|
|
|
#[error("Failed to establish proxy: {0}")]
|
|
ProxySetupError(String),
|
|
|
|
#[error("Error proxying request: {0}")]
|
|
ProxyRequestError(hyper::Error),
|
|
|
|
#[error(transparent)]
|
|
Other(#[from] anyhow::Error),
|
|
}
|
|
|
|
impl From<&str> for Error {
|
|
fn from(s: &str) -> Self {
|
|
Error::Unique(s.to_string())
|
|
}
|
|
}
|
|
|
|
impl From<String> for Error {
|
|
fn from(s: String) -> Self {
|
|
Error::Unique(s)
|
|
}
|
|
}
|
|
|
|
impl From<html_parser::Error> for Error {
|
|
fn from(e: html_parser::Error) -> Self {
|
|
Self::ParseError(e.to_string())
|
|
}
|
|
}
|
|
|
|
impl From<hyper::Error> for Error {
|
|
fn from(e: hyper::Error) -> Self {
|
|
Self::RuntimeError(e.to_string())
|
|
}
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! custom_error {
|
|
($msg:literal $(,)?) => {
|
|
Err(Error::CustomError(format!($msg)))
|
|
};
|
|
($err:expr $(,)?) => {
|
|
Err(Error::from($err))
|
|
};
|
|
($fmt:expr, $($arg:tt)*) => {
|
|
Err(Error::CustomError(format!($fmt, $($arg)*)))
|
|
};
|
|
}
|