Skip to content

Commit 407f84f

Browse files
author
Ralph Küpper
committed
fix: resolve the conflict markers #7786's merge shipped in release_source.rs
My resolution of #7786's rebase missed a fourth conflicted file; the markers landed on main and broke the perry bin build. All three blocks take #7786's side — the one-spelling-per-source policy its own doc block states. Verified: cargo check -p perry clean. Claude-Session: https://claude.ai/code/session_01Y1QZ5wUP9gRSwpiweT4Wix
1 parent 94fdafd commit 407f84f

1 file changed

Lines changed: 0 additions & 18 deletions

File tree

crates/perry/src/release_source.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ pub(crate) enum CheckSource {
7373

7474
/// Parse a configured `source` name into a source, given the other keys.
7575
///
76-
<<<<<<< HEAD
77-
/// Returns `None` for a name this build does not know, so the caller can fall
78-
/// back rather than fail — a config written by a newer Perry must not break an
79-
/// older one's update check.
80-
=======
8176
/// One spelling per source, deliberately: a set of accepted aliases is a
8277
/// surface to keep documented and tested forever in exchange for saving one
8378
/// lookup in the docs.
@@ -86,7 +81,6 @@ pub(crate) enum CheckSource {
8681
/// to the default rather than refusing to check at all. That is not a
8782
/// compatibility affordance — it is that an update check is the wrong place to
8883
/// turn a config typo into a hard failure.
89-
>>>>>>> 373f3fdd1 (feat(cli): hold back brand-new releases, remember a skipped version, and document the whole surface)
9084
pub(crate) fn from_config(
9185
source: Option<&str>,
9286
package: Option<&str>,
@@ -95,28 +89,16 @@ pub(crate) fn from_config(
9589
) -> Option<CheckSource> {
9690
let package = || package.unwrap_or(PERRY_NPM_PACKAGE).to_string();
9791
match source?.trim().to_ascii_lowercase().as_str() {
98-
<<<<<<< HEAD
99-
"gh-releases" | "github" => Some(CheckSource::GhReleases {
100-
=======
10192
"gh-releases" => Some(CheckSource::GhReleases {
102-
>>>>>>> 373f3fdd1 (feat(cli): hold back brand-new releases, remember a skipped version, and document the whole surface)
10393
url: server
10494
.unwrap_or(super::update_checker::GITHUB_URL)
10595
.to_string(),
10696
}),
107-
<<<<<<< HEAD
108-
"npm" | "npm-registry" => Some(CheckSource::Npm {
109-
package: package(),
110-
registry: registry.unwrap_or(NPM_REGISTRY).to_string(),
111-
}),
112-
"gh-registry" | "github-packages" => Some(CheckSource::GhRegistry {
113-
=======
11497
"npm" => Some(CheckSource::Npm {
11598
package: package(),
11699
registry: registry.unwrap_or(NPM_REGISTRY).to_string(),
117100
}),
118101
"gh-registry" => Some(CheckSource::GhRegistry {
119-
>>>>>>> 373f3fdd1 (feat(cli): hold back brand-new releases, remember a skipped version, and document the whole surface)
120102
package: package(),
121103
registry: registry.unwrap_or(GH_REGISTRY).to_string(),
122104
}),

0 commit comments

Comments
 (0)