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

docs(tvix/nix-compat): remove disambiguity

Browse source 
Don't import thiserror::Error directly, so rustdoc knows what
`crate::store_path::Error` we're talking about.

Change-Id: I755c9377521a6833e9a77cb1a41b48edafb31fe0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9086
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-08-19 12:39:45 +02:00 committed by clbot
parent 39efe50311
commit b5ed3a90f2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tvix/nix-compat/src/store_path/mod.rs
View file

@ -1,6 +1,6 @@
use crate::nixbase32::{self, Nixbase32DecodeError}; use crate::nixbase32::{self, Nixbase32DecodeError};
use std::{fmt, path::PathBuf, str::FromStr}; use std::{fmt, path::PathBuf, str::FromStr};
use thiserror::Error; use thiserror;
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
use std::os::unix::ffi::OsStringExt; use std::os::unix::ffi::OsStringExt;
@ -20,7 +20,7 @@ pub const STORE_DIR: &str = "/nix/store";
pub const STORE_DIR_WITH_SLASH: &str = "/nix/store/"; pub const STORE_DIR_WITH_SLASH: &str = "/nix/store/";
/// Errors that can occur when parsing a literal store path /// Errors that can occur when parsing a literal store path
#[derive(Debug, PartialEq, Eq, Error)] #[derive(Debug, PartialEq, Eq, thiserror::Error)]
pub enum Error { pub enum Error {
#[error("Dash is missing between hash and name")] #[error("Dash is missing between hash and name")]
MissingDash(), MissingDash(),

2
tvix/nix-compat/src/store_path/utils.rs
View file

@ -7,7 +7,7 @@ use thiserror;
/// Errors that can occur when creating a content-addressed store path. /// Errors that can occur when creating a content-addressed store path.
/// ///
/// This wraps the main [Error].. /// This wraps the main [crate::store_path::Error]..
#[derive(Debug, PartialEq, Eq, thiserror::Error)] #[derive(Debug, PartialEq, Eq, thiserror::Error)]
pub enum BuildStorePathError { pub enum BuildStorePathError {
#[error("Invalid Store Path: {0}")] #[error("Invalid Store Path: {0}")]