mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/nix-compat-derive): Remove references to nixrs

Browse source 
Some references to nixrs had sneaked in while writing the original
CL so this just removes those.

Change-Id: I635adbd2de46c7c1f31e1d449396253a78e1b762
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12727
Reviewed-by: Vladimir Kryachko <v.kryachko@gmail.com>
Autosubmit: Brian Olsen <me@griff.name>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Brian Olsen 2024-11-03 20:28:34 +01:00 committed by clbot
parent 685f25ebff
commit 37a7bfa163
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tvix/nix-compat-derive/src/de.rs
View file

@ -7,9 +7,12 @@ use crate::internal::attrs::Default;
use crate::internal::inputs::RemoteInput;
use crate::internal::{attrs, Container, Context, Data, Field, Remote, Style, Variant};
pub fn expand_nix_deserialize(nnixrs: Path, input: &mut DeriveInput) -> syn::Result<TokenStream> {
pub fn expand_nix_deserialize(
crate_path: Path,
input: &mut DeriveInput,
) -> syn::Result<TokenStream> {
let cx = Context::new();
let cont = Container::from_ast(&cx, nnixrs, input);
let cont = Container::from_ast(&cx, crate_path, input);
cx.check()?;
let cont = cont.unwrap();

2
tvix/nix-compat-derive/src/internal/mod.rs
View file

@ -113,7 +113,7 @@ impl<'a> Container<'a> {
Data::Enum(variants)
}
syn::Data::Union(u) => {
ctx.error_spanned(u.union_token, "Union not supported by nixrs");
ctx.error_spanned(u.union_token, "Union not supported by nix-compat");
return None;
}
};

4
tvix/nix-compat-derive/src/lib.rs
View file

@ -264,8 +264,8 @@ mod internal;
#[proc_macro_derive(NixDeserialize, attributes(nix))]
pub fn derive_nix_deserialize(item: TokenStream) -> TokenStream {
let mut input = syn::parse_macro_input!(item as DeriveInput);
let nnixrs: syn::Path = parse_quote!(::nix_compat);
de::expand_nix_deserialize(nnixrs, &mut input)
let crate_path: syn::Path = parse_quote!(::nix_compat);
de::expand_nix_deserialize(crate_path, &mut input)
.unwrap_or_else(syn::Error::into_compile_error)
.into()
}