user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: uniformize ty::print's error handling by requiring Result.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2019-01-09 16:30:10 +02:00
parent 972af5e808
commit 5616ca857d
6 changed files with 114 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/librustdoc/clean/mod.rs
View file

@ -4230,10 +4230,15 @@ where F: Fn(DefId) -> Def {
struct AbsolutePathPrinter;
impl Printer for AbsolutePathPrinter {
type Error = !;
type Path = Vec<String>;
fn path_crate(self: &mut PrintCx<'_, '_, '_, Self>, cnum: CrateNum) -> Self::Path {
vec![self.tcx.original_crate_name(cnum).to_string()]
fn path_crate(
self: &mut PrintCx<'_, '_, '_, Self>,
cnum: CrateNum,
) -> Result<Self::Path, Self::Error> {
Ok(vec![self.tcx.original_crate_name(cnum).to_string()])
}
fn path_qualified(
self: &mut PrintCx<'_, '_, 'tcx, Self>,
@ -4241,7 +4246,7 @@ where F: Fn(DefId) -> Def {
self_ty: Ty<'tcx>,
trait_ref: Option<ty::TraitRef<'tcx>>,
_ns: Namespace,
) -> Self::Path {
) -> Result<Self::Path, Self::Error> {
let mut path = impl_prefix.unwrap_or(vec![]);
// This shouldn't ever be needed, but just in case:
@ -4251,15 +4256,15 @@ where F: Fn(DefId) -> Def {
path.push(format!("<{}>", self_ty));
}
path
Ok(path)
}
fn path_append(
self: &mut PrintCx<'_, '_, '_, Self>,
mut path: Self::Path,
text: &str,
) -> Self::Path {
) -> Result<Self::Path, Self::Error> {
path.push(text.to_string());
path
Ok(path)
}
fn path_generic_args(
self: &mut PrintCx<'_, '_, 'tcx, Self>,
@ -4268,13 +4273,14 @@ where F: Fn(DefId) -> Def {
_substs: SubstsRef<'tcx>,
_ns: Namespace,
_projections: impl Iterator<Item = ty::ExistentialProjection<'tcx>>,
) -> Self::Path {
path
) -> Result<Self::Path, Self::Error> {
Ok(path)
}
}
let names = PrintCx::new(tcx, AbsolutePathPrinter)
.print_def_path(def_id, None, Namespace::TypeNS, iter::empty());
.print_def_path(def_id, None, Namespace::TypeNS, iter::empty())
.unwrap();
hir::Path {
span: DUMMY_SP,

1
src/librustdoc/lib.rs
View file

@ -18,6 +18,7 @@
#![feature(const_fn)]
#![feature(drain_filter)]
#![feature(inner_deref)]
#![feature(never_type)]
#![recursion_limit="256"]