From c3bfc68bddc6300571776fd958143a289c9f6e82 Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 3 Oct 2025 09:36:43 -0400 Subject: [PATCH 1/2] fix CONDA_ROOT docs --- crates/uv-macros/src/lib.rs | 5 ++++- docs/reference/environment.md | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/crates/uv-macros/src/lib.rs b/crates/uv-macros/src/lib.rs index 8c29fbaf23b45..b731eb825d832 100644 --- a/crates/uv-macros/src/lib.rs +++ b/crates/uv-macros/src/lib.rs @@ -91,8 +91,11 @@ pub fn attribute_env_vars_metadata(_attr: TokenStream, input: TokenStream) -> To .iter() .filter_map(|item| match item { ImplItem::Const(item) if !is_hidden(&item.attrs) => { - let name = item.ident.to_string(); let doc = get_doc_comment(&item.attrs); + let syn::Expr::Lit(syn::ExprLit { lit:syn::Lit::Str(lit), .. }) = &item.expr else { + return None; + }; + let name = lit.value(); Some((name, doc)) } ImplItem::Fn(item) if !is_hidden(&item.attrs) => { diff --git a/docs/reference/environment.md b/docs/reference/environment.md index 2ba729cd432c9..5eb75c939c2ee 100644 --- a/docs/reference/environment.md +++ b/docs/reference/environment.md @@ -635,10 +635,6 @@ Used to determine the name of the active Conda environment. Used to detect the path of an active Conda environment. -### `CONDA_ROOT` - -Used to determine the root install path of Conda. - ### `FISH_VERSION` Used to detect Fish shell usage. @@ -889,3 +885,7 @@ Used to determine which `.zshenv` to use when Zsh is being used. Used to detect Zsh shell usage. +### `_CONDA_ROOT` + +Used to determine the root install path of Conda. + From 3b2a1331c3975c308077c444329d35fa3a1d32c2 Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Fri, 3 Oct 2025 10:35:14 -0400 Subject: [PATCH 2/2] fmt --- crates/uv-macros/src/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/uv-macros/src/lib.rs b/crates/uv-macros/src/lib.rs index b731eb825d832..503eb1dd9ddcf 100644 --- a/crates/uv-macros/src/lib.rs +++ b/crates/uv-macros/src/lib.rs @@ -92,7 +92,11 @@ pub fn attribute_env_vars_metadata(_attr: TokenStream, input: TokenStream) -> To .filter_map(|item| match item { ImplItem::Const(item) if !is_hidden(&item.attrs) => { let doc = get_doc_comment(&item.attrs); - let syn::Expr::Lit(syn::ExprLit { lit:syn::Lit::Str(lit), .. }) = &item.expr else { + let syn::Expr::Lit(syn::ExprLit { + lit: syn::Lit::Str(lit), + .. + }) = &item.expr + else { return None; }; let name = lit.value();