diff options
| author | John Turner <jturner.usa@gmail.com> | 2025-12-21 04:20:53 +0000 |
|---|---|---|
| committer | John Turner <jturner.usa@gmail.com> | 2025-12-22 08:05:20 +0000 |
| commit | 96708614ba46c42f87b23f2a957c510499d8811e (patch) | |
| tree | 372dcf90f1a6fdf1b90f5d006ce7a32717f47166 /subprojects/thiserror/src/display.rs | |
| parent | 0ec856797256b5d9807929e1b32c03756eb43124 (diff) | |
| download | gentoo-utils-feature/port-to-meson-cargo.tar.gz | |
port to meson cargoHEADmasterfeature/port-to-meson-cargo
Use the new unstable meson cargo support. This simplifies the
meson.build script and allows to use crates such as clap that require
picking up features from Cargo.toml.
This also allows us to not embed thiserror in subprojects, and instead
use a wrap file with a custom meson.build and some patches to make it
compile without running its build.rs script.
Diffstat (limited to 'subprojects/thiserror/src/display.rs')
| -rw-r--r-- | subprojects/thiserror/src/display.rs | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/subprojects/thiserror/src/display.rs b/subprojects/thiserror/src/display.rs deleted file mode 100644 index e544657..0000000 --- a/subprojects/thiserror/src/display.rs +++ /dev/null @@ -1,82 +0,0 @@ -use core::fmt::Display; -#[cfg(feature = "std")] -use std::path::{self, Path, PathBuf}; - -#[doc(hidden)] -pub trait AsDisplay<'a>: Sealed { - // TODO: convert to generic associated type. - // https://github.com/dtolnay/thiserror/pull/253 - type Target: Display; - - fn as_display(&'a self) -> Self::Target; -} - -impl<'a, T> AsDisplay<'a> for &T -where - T: Display + ?Sized + 'a, -{ - type Target = &'a T; - - fn as_display(&'a self) -> Self::Target { - *self - } -} - -#[cfg(feature = "std")] -impl<'a> AsDisplay<'a> for Path { - type Target = path::Display<'a>; - - #[inline] - fn as_display(&'a self) -> Self::Target { - self.display() - } -} - -#[cfg(feature = "std")] -impl<'a> AsDisplay<'a> for PathBuf { - type Target = path::Display<'a>; - - #[inline] - fn as_display(&'a self) -> Self::Target { - self.display() - } -} - -#[doc(hidden)] -pub trait Sealed {} -impl<T: Display + ?Sized> Sealed for &T {} -#[cfg(feature = "std")] -impl Sealed for Path {} -#[cfg(feature = "std")] -impl Sealed for PathBuf {} - -// Add a synthetic second impl of AsDisplay to prevent the "single applicable -// impl" rule from making too weird inference decision based on the single impl -// for &T, which could lead to code that compiles with thiserror's std feature -// off but breaks under feature unification when std is turned on by an -// unrelated crate. -#[cfg(not(feature = "std"))] -mod placeholder { - use super::{AsDisplay, Sealed}; - use core::fmt::{self, Display}; - - #[allow(dead_code)] - pub struct Placeholder; - - impl<'a> AsDisplay<'a> for Placeholder { - type Target = Self; - - #[inline] - fn as_display(&'a self) -> Self::Target { - Placeholder - } - } - - impl Display for Placeholder { - fn fmt(&self, _formatter: &mut fmt::Formatter) -> fmt::Result { - unreachable!() - } - } - - impl Sealed for Placeholder {} -} |
