Use "pre-release" in prose and Prerelease in code (#5697)

## Summary

Closes https://github.com/astral-sh/uv/issues/5630.
This commit is contained in:
Charlie Marsh 2024-08-01 16:56:29 -04:00 committed by GitHub
parent 6797caccdb
commit 499c368f1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 278 additions and 277 deletions

View file

@ -16,7 +16,7 @@ use uv_configuration::{
};
use uv_normalize::{ExtraName, PackageName};
use uv_python::{PythonFetch, PythonPreference, PythonVersion};
use uv_resolver::{AnnotationStyle, ExcludeNewer, PreReleaseMode, ResolutionMode};
use uv_resolver::{AnnotationStyle, ExcludeNewer, PrereleaseMode, ResolutionMode};
pub mod compat;
pub mod options;
@ -2868,7 +2868,7 @@ pub struct ResolverArgs {
/// along with first-party requirements that contain an explicit pre-release marker in the
/// declared specifiers (`if-necessary-or-explicit`).
#[arg(long, value_enum, env = "UV_PRERELEASE")]
pub prerelease: Option<PreReleaseMode>,
pub prerelease: Option<PrereleaseMode>,
#[arg(long, hide = true)]
pub pre: bool,
@ -2957,7 +2957,7 @@ pub struct ResolverInstallerArgs {
/// along with first-party requirements that contain an explicit pre-release marker in the
/// declared specifiers (`if-necessary-or-explicit`).
#[arg(long, value_enum, env = "UV_PRERELEASE")]
pub prerelease: Option<PreReleaseMode>,
pub prerelease: Option<PrereleaseMode>,
#[arg(long, hide = true)]
pub pre: bool,

View file

@ -1,6 +1,6 @@
use uv_cache::Refresh;
use uv_configuration::ConfigSettings;
use uv_resolver::PreReleaseMode;
use uv_resolver::PrereleaseMode;
use uv_settings::{PipOptions, ResolverInstallerOptions, ResolverOptions};
use crate::{
@ -53,7 +53,7 @@ impl From<ResolverArgs> for PipOptions {
keyring_provider,
resolution,
prerelease: if pre {
Some(PreReleaseMode::Allow)
Some(PrereleaseMode::Allow)
} else {
prerelease
},
@ -128,7 +128,7 @@ impl From<ResolverInstallerArgs> for PipOptions {
keyring_provider,
resolution,
prerelease: if pre {
Some(PreReleaseMode::Allow)
Some(PrereleaseMode::Allow)
} else {
prerelease
},
@ -212,7 +212,7 @@ pub fn resolver_options(resolver_args: ResolverArgs, build_args: BuildArgs) -> R
keyring_provider,
resolution,
prerelease: if pre {
Some(PreReleaseMode::Allow)
Some(PrereleaseMode::Allow)
} else {
prerelease
},
@ -283,7 +283,7 @@ pub fn resolver_installer_options(
keyring_provider,
resolution,
prerelease: if pre {
Some(PreReleaseMode::Allow)
Some(PrereleaseMode::Allow)
} else {
prerelease
},