From 542e603229727cf1dab2935846452a78e1f8f2fd Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 30 Jan 2025 15:23:51 -0600
Subject: [PATCH] chore: Upgrade to Winnow 0.7 (#183)

* chore: Upgrade to Winnow 0.6.26

* chore: Resolve deprecations

* chore: Upgrade to Winnow 0.7

* refactor: Simplify parser error type
---
 Cargo.lock      | 27 ++++++++++++++++++---------
 Cargo.toml      |  2 +-
 src/registry.rs |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee69e29..7395b0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -365,7 +365,7 @@ dependencies = [
  "test-case",
  "toml_edit",
  "url",
- "winnow",
+ "winnow 0.7.0",
 ]
 
 [[package]]
@@ -1062,7 +1062,7 @@ dependencies = [
  "gix-utils",
  "itoa",
  "thiserror",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -1144,7 +1144,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -1419,7 +1419,7 @@ dependencies = [
  "itoa",
  "smallvec",
  "thiserror",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -1542,7 +1542,7 @@ dependencies = [
  "gix-utils",
  "maybe-async",
  "thiserror",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -1574,7 +1574,7 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -3134,7 +3134,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.26",
 ]
 
 [[package]]
@@ -3585,9 +3585,18 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8b090e6..54db339 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ semver = "1.0.23"
 serde = { version = "1.0.210", features = ["derive"] }
 toml_edit = "0.22.22"
 url = "2.5.2"
-winnow = "0.6.20"
+winnow = "0.7.0"
 clap-cargo = "0.14.1"
 
 [dev-dependencies]
diff --git a/src/registry.rs b/src/registry.rs
index a2d9713..e32acd6 100644
--- a/src/registry.rs
+++ b/src/registry.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, env, ffi::OsString, io, path::PathBuf};
 
 use anyhow::Context;
 use cargo::{core::shell::Shell, util::context::GlobalContext};
-use winnow::{token::take_until, PResult, Parser};
+use winnow::{token::take_until, Parser};
 
 pub fn get_registry_name_from_url(
     working_dir: PathBuf,
@@ -74,7 +74,7 @@ fn get_registry_from_env(
     None
 }
 
-fn registry_key(input: &str) -> PResult<&str> {
+fn registry_key(input: &str) -> winnow::Result<&str> {
     // Format CARGO_REGISTRIES_{REGISTRY_NAME}_INDEX
     let (_, (_, registry)) = ("CARGO_REGISTRIES_", take_until(0.., "_INDEX")).parse_peek(input)?;