summaryrefslogtreecommitdiff
path: root/cli/standalone/binary.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/standalone/binary.rs')
-rw-r--r--cli/standalone/binary.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs
index 00b8d19f3..8df52e3eb 100644
--- a/cli/standalone/binary.rs
+++ b/cli/standalone/binary.rs
@@ -24,6 +24,7 @@ use deno_core::futures::AsyncSeekExt;
use deno_core::serde_json;
use deno_core::url::Url;
use deno_npm::NpmSystemInfo;
+use deno_semver::npm::NpmVersionReqParseError;
use deno_semver::package::PackageReq;
use deno_semver::VersionReqSpecifierParseError;
use log::Level;
@@ -55,15 +56,15 @@ const MAGIC_TRAILER: &[u8; 8] = b"d3n0l4nd";
#[derive(Serialize, Deserialize)]
enum SerializablePackageJsonDepValueParseError {
- Specifier(String),
+ VersionReq(String),
Unsupported { scheme: String },
}
impl SerializablePackageJsonDepValueParseError {
pub fn from_err(err: PackageJsonDepValueParseError) -> Self {
match err {
- PackageJsonDepValueParseError::Specifier(err) => {
- Self::Specifier(err.source.to_string())
+ PackageJsonDepValueParseError::VersionReq(err) => {
+ Self::VersionReq(err.source.to_string())
}
PackageJsonDepValueParseError::Unsupported { scheme } => {
Self::Unsupported { scheme }
@@ -73,12 +74,10 @@ impl SerializablePackageJsonDepValueParseError {
pub fn into_err(self) -> PackageJsonDepValueParseError {
match self {
- SerializablePackageJsonDepValueParseError::Specifier(source) => {
- PackageJsonDepValueParseError::Specifier(
- VersionReqSpecifierParseError {
- source: monch::ParseErrorFailureError::new(source),
- },
- )
+ SerializablePackageJsonDepValueParseError::VersionReq(source) => {
+ PackageJsonDepValueParseError::VersionReq(NpmVersionReqParseError {
+ source: monch::ParseErrorFailureError::new(source),
+ })
}
SerializablePackageJsonDepValueParseError::Unsupported { scheme } => {
PackageJsonDepValueParseError::Unsupported { scheme }