mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-26 20:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename puffin-warnings macros to avoid tracing collision (#694)

Browse source 
Also more consistent with Ruff.
This commit is contained in:
Charlie Marsh 2023-12-18 16:33:21 -05:00 • committed by GitHub
parent e98804141c
commit 207bb83a1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/puffin-resolver/src/version_map.rs
View file

@ -10,7 +10,7 @@ use platform_tags::{TagPriority, Tags};
use puffin_client::SimpleMetadata; use puffin_client::SimpleMetadata;
use puffin_interpreter::Interpreter; use puffin_interpreter::Interpreter;
use puffin_normalize::PackageName; use puffin_normalize::PackageName;
use puffin_warnings::warn_once; use puffin_warnings::warn_user_once;
use pypi_types::Yanked; use pypi_types::Yanked;
use crate::file::{DistFile, SdistFile, WheelFile}; use crate::file::{DistFile, SdistFile, WheelFile};
@ -63,7 +63,7 @@ impl VersionMap {
continue; continue;
} }
None => { None => {
warn_once!( warn_user_once!(
"{} is missing an upload date, but user provided: {}", "{} is missing an upload date, but user provided: {}",
file.filename, file.filename,
exclude_newer, exclude_newer,

4
crates/puffin-warnings/src/lib.rs
View file

@ -17,7 +17,7 @@ pub fn enable() {
/// Warn a user, if warnings are enabled. /// Warn a user, if warnings are enabled.
#[macro_export] #[macro_export]
macro_rules! warn { macro_rules! warn_user {
($($arg:tt)*) => { ($($arg:tt)*) => {
use $crate::colored::Colorize; use $crate::colored::Colorize;
@ -34,7 +34,7 @@ pub static WARNINGS: Lazy<Mutex<FxHashSet<String>>> = Lazy::new(Mutex::default);
/// Warn a user once, if warnings are enabled, with uniqueness determined by the content of the /// Warn a user once, if warnings are enabled, with uniqueness determined by the content of the
/// message. /// message.
#[macro_export] #[macro_export]
macro_rules! warn_once { macro_rules! warn_user_once {
($($arg:tt)*) => { ($($arg:tt)*) => {
use $crate::colored::Colorize; use $crate::colored::Colorize;

4
crates/pypi-types/src/lenient_requirement.rs
View file

@ -6,7 +6,7 @@ use serde::{de, Deserialize, Deserializer, Serialize};
use pep440_rs::{Pep440Error, VersionSpecifiers}; use pep440_rs::{Pep440Error, VersionSpecifiers};
use pep508_rs::{Pep508Error, Requirement}; use pep508_rs::{Pep508Error, Requirement};
use puffin_warnings::warn_once; use puffin_warnings::warn_user_once;
/// Ex) `>=7.2.0<8.0.0` /// Ex) `>=7.2.0<8.0.0`
static MISSING_COMMA: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d)([<>=~^!])").unwrap()); static MISSING_COMMA: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\d)([<>=~^!])").unwrap());
@ -63,7 +63,7 @@ fn parse_with_fixups<Err, T: FromStr<Err = Err>>(input: &str, type_name: &str) -
} }
if let Ok(requirement) = T::from_str(&patched_input) { if let Ok(requirement) = T::from_str(&patched_input) {
warn_once!( warn_user_once!(
"Fixing invalid {type_name} by {} (before: `{input}`; after: `{patched_input}`)", "Fixing invalid {type_name} by {} (before: `{input}`; after: `{patched_input}`)",
messages.join(", ") messages.join(", ")
); );