Skip to content

Commit a26d83e

Browse files
committed
address PR comments, added error handling for yarn latest-version api
1 parent d888ba8 commit a26d83e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

crates/notion-core/src/catalog.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl RegistryFetchError {
280280

281281
impl Resolve<NodeDistro> for NodeCollection {
282282
fn resolve_public(&self, matching: &VersionReq) -> Fallible<NodeDistro> {
283-
let index: Index = resolve_node_versions().unwrap().into_index()?;
283+
let index: Index = resolve_node_versions()?.into_index()?;
284284

285285
let version = index.entries.iter()
286286
.rev()
@@ -443,7 +443,7 @@ fn resolve_node_versions() -> Result<serial::index::Index, NotionError> {
443443
pub fn parse_node_version(src: String) -> Fallible<String> {
444444
let mut version:String= src;
445445
if version == "latest" {
446-
let index = resolve_node_versions().unwrap().into_index()?;
446+
let index = resolve_node_versions()?.into_index()?;
447447
let mut latest_version:Version = index.entries.keys().next().unwrap().clone();
448448
for key in index.entries.keys() {
449449
if key > &latest_version {
@@ -458,7 +458,8 @@ pub fn parse_node_version(src: String) -> Fallible<String> {
458458
pub fn parse_yarn_version(src: String) -> Fallible<String> {
459459
let mut version:String = src;
460460
if version == "latest" {
461-
let mut response: reqwest::Response = reqwest::get(PUBLIC_YARN_LATEST_VERSION).unwrap();
461+
let mut response: reqwest::Response = reqwest::get(PUBLIC_YARN_LATEST_VERSION)
462+
.with_context(RegistryFetchError::from_error)?;
462463
version = response.text().unknown()?;
463464
}
464465
Ok(version)

0 commit comments

Comments
 (0)