Upgrade pubgrub version.

Author: Kaholaz

Cargo.lock

@@ -29,7 +29,7 @@ toml = "0"
 # Enum trait impl macros
 strum = { version = "0", features = ["derive"] }
 # Hex package manager client
-hexpm = "3.3"
+hexpm = "4"
 # Creation of tar file archives
 tar = "0"
 # gzip compression

Cargo.toml

@@ -36,7 +36,7 @@ same-file = "1"
 # Open generated docs in browser
 opener = "0"
 # Pubgrub dependency resolution algorithm
-pubgrub = "0"
+pubgrub = "0.3"
 
 camino = { workspace = true, features = ["serde1"] }
 async-trait.workspace = true

compiler-cli/Cargo.toml

@@ -12,7 +12,7 @@ use gleam_core::{
     Error, Result,
     build::{Mode, Target, Telemetry},
     config::{GleamVersion, PackageConfig},
-    dependency,
+    dependency::{self, PackageFetchError},
     error::{FileIoAction, FileKind, ShellCommandFailureReason, StandardIoAction},
     hex::{self, HEXPM_PUBLIC_KEY},
     io::{HttpClient as _, TarUnpacker, WrappedReader},
@@ -1231,6 +1231,7 @@ async fn lookup_package(
     }
 }
 
+#[derive(Debug)]
 struct PackageFetcher {
     runtime: tokio::runtime::Handle,
     http: HttpClient,
@@ -1272,26 +1273,14 @@ impl TarUnpacker for Untar {
 }
 
 impl dependency::PackageFetcher for PackageFetcher {
-    fn get_dependencies(
-        &self,
-        package: &str,
-    ) -> Result<hexpm::Package, Box<dyn std::error::Error>> {
+    fn get_dependencies(&self, package: &str) -> Result<hexpm::Package, PackageFetchError> {
         tracing::debug!(package = package, "looking_up_hex_package");
         let config = hexpm::Config::new();
         let request = hexpm::get_package_request(package, None, &config);
         let response = self
             .runtime
             .block_on(self.http.send(request))
-            .map_err(Box::new)?;
-
-        match hexpm::get_package_response(response, HEXPM_PUBLIC_KEY) {
-            Ok(a) => Ok(a),
-            Err(e) => match e {
-                hexpm::ApiError::NotFound => {
-                    Err(format!("I couldn't find a package called `{}`", package).into())
-                }
-                _ => Err(e.into()),
-            },
-        }
+            .map_err(|e| PackageFetchError::fetch_error(e.to_string()))?;
+        hexpm::get_package_response(response, HEXPM_PUBLIC_KEY).map_err(|e| e.into())
     }
 }

compiler-cli/src/dependencies.rs

@@ -335,8 +335,7 @@ fn do_build_hex_tarball(paths: &ProjectPaths, config: &mut PackageConfig) -> Res
             // inferred lower bound could be lower.
             let minimum_required_version =
                 std::cmp::max(minimum_required_version, Version::new(1, 0, 0));
-            let inferred_version_range =
-                pubgrub::range::Range::higher_than(minimum_required_version);
+            let inferred_version_range = pubgrub::Range::higher_than(minimum_required_version);
             config.gleam_version = Some(GleamVersion::from_pubgrub(inferred_version_range));
         }
         // Otherwise we need to check that the annotated version range is

compiler-cli/src/publish.rs

@@ -31,7 +31,7 @@ globset = { version = "0", features = ["serde1"] }
 # Checksums
 xxhash-rust = { version = "0", features = ["xxh3"] }
 # Pubgrub dependency resolution algorithm
-pubgrub = "0"
+pubgrub = "0.3"
 # Used for converting absolute path to relative path
 pathdiff = { version = "0", features = ["camino"] }
 # Memory arena using ids rather than references

compiler-core/Cargo.toml

@@ -24,7 +24,7 @@ use crate::{
 use ecow::EcoString;
 use hexpm::version::Version;
 use itertools::Itertools;
-use pubgrub::range::Range;
+use pubgrub::Range;
 use std::{
     cmp,
     collections::{HashMap, HashSet},

compiler-core/src/build/project_compiler.rs

@@ -9,7 +9,7 @@ use crate::{Error, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use ecow::EcoString;
 use globset::{Glob, GlobSetBuilder};
-use hexpm::version::{self, Version};
+use hexpm::version::{self, LowestVersion, Version};
 use http::Uri;
 use serde::ser::SerializeSeq;
 use serde::{Deserialize, Serialize};
@@ -100,12 +100,12 @@ impl From<GleamVersion> for pubgrub::Range<Version> {
 }
 
 impl GleamVersion {
-    pub fn from_pubgrub(range: pubgrub::range::Range<Version>) -> Self {
+    pub fn from_pubgrub(range: pubgrub::Range<Version>) -> Self {
         let range: version::Range = range.into();
         range.into()
     }
 
-    pub fn as_pubgrub(&self) -> &pubgrub::range::Range<Version> {
+    pub fn as_pubgrub(&self) -> &pubgrub::Range<Version> {
         self.0.to_pubgrub()
     }