diff options
| author | Florian Klink <flokli@flokli.de> | 2023-08-19T10·39+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-08-19T11·27+0000 |
| commit | b5ed3a90f2b8107a921c55a1fb1b52c827d1b778 (patch) | |
| tree | 7088557a3ad898359e9d49c9471128ec6b1ef403 /tvix/nix-compat/src/store_path | |
| parent | 39efe50311e459a2011d0abd4d06e1147ca38509 (diff) | |
docs(tvix/nix-compat): remove disambiguity r/6488
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>
Diffstat (limited to 'tvix/nix-compat/src/store_path')
| -rw-r--r-- | tvix/nix-compat/src/store_path/mod.rs | 4 | ||||
| -rw-r--r-- | tvix/nix-compat/src/store_path/utils.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tvix/nix-compat/src/store_path/mod.rs b/tvix/nix-compat/src/store_path/mod.rs index fef57aa7ff72..2712a7548f2e 100644 --- a/tvix/nix-compat/src/store_path/mod.rs +++ b/tvix/nix-compat/src/store_path/mod.rs @@ -1,6 +1,6 @@ use crate::nixbase32::{self, Nixbase32DecodeError}; use std::{fmt, path::PathBuf, str::FromStr}; -use thiserror::Error; +use thiserror; #[cfg(target_family = "unix")] 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/"; /// Errors that can occur when parsing a literal store path -#[derive(Debug, PartialEq, Eq, Error)] +#[derive(Debug, PartialEq, Eq, thiserror::Error)] pub enum Error { #[error("Dash is missing between hash and name")] MissingDash(), diff --git a/tvix/nix-compat/src/store_path/utils.rs b/tvix/nix-compat/src/store_path/utils.rs index 16a1bf3e1fe5..26f6e0085c9d 100644 --- a/tvix/nix-compat/src/store_path/utils.rs +++ b/tvix/nix-compat/src/store_path/utils.rs @@ -7,7 +7,7 @@ use thiserror; /// 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)] pub enum BuildStorePathError { #[error("Invalid Store Path: {0}")] |