-
Notifications
You must be signed in to change notification settings - Fork 13.3k
[rustdoc] Detect and resolve ambiguities in fn parameters type names #122872
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
use rustc_data_structures::fx::FxHashMap; | ||
use rustc_hir::def_id::DefId; | ||
use rustc_span::Symbol; | ||
|
||
use crate::clean::{self, FnDecl, Function}; | ||
|
||
#[derive(Debug, Clone)] | ||
pub struct PathLike<'a> { | ||
path: &'a clean::Path, | ||
suffix_len: usize, | ||
} | ||
|
||
impl<'a> PathLike<'a> { | ||
pub fn make_longer(self) -> Self { | ||
let Self { path, suffix_len } = self; | ||
assert!(suffix_len < path.segments.len(), "{self:?}"); | ||
Self { path, suffix_len: suffix_len + 1 } | ||
} | ||
|
||
pub fn iter_from_end(&self) -> impl DoubleEndedIterator<Item = &'a Symbol> { | ||
self.path.segments.iter().map(|seg| &seg.name).rev().take(self.suffix_len) | ||
} | ||
} | ||
|
||
impl<'a> Eq for PathLike<'a> {} | ||
impl<'a> PartialEq for PathLike<'a> { | ||
fn eq(&self, other: &Self) -> bool { | ||
if self.suffix_len != other.suffix_len { | ||
return false; | ||
} | ||
let self_suffix = self.iter_from_end(); | ||
let other_suffix = other.iter_from_end(); | ||
self_suffix.zip(other_suffix).all(|(s, o)| s.eq(o)) | ||
} | ||
} | ||
|
||
impl<'a> std::hash::Hash for PathLike<'a> { | ||
fn hash<H: std::hash::Hasher>(&self, state: &mut H) { | ||
for sym in self.iter_from_end() { | ||
sym.hash(state) | ||
} | ||
} | ||
} | ||
|
||
#[derive(Debug, Clone)] | ||
pub struct AmbiguityTable<'a> { | ||
inner: FxHashMap<DefId, PathLike<'a>>, | ||
} | ||
|
||
impl<'a> AmbiguityTable<'a> { | ||
pub fn empty() -> Self { | ||
Self { inner: FxHashMap::default() } | ||
} | ||
|
||
// pub fn is_empty(&self) -> bool { | ||
// self.inner.is_empty() | ||
// } | ||
|
||
pub fn build() -> AmbiguityTableBuilder<'a> { | ||
AmbiguityTableBuilder { inner: FxHashMap::default() } | ||
} | ||
|
||
#[allow(rustc::pass_by_value)] | ||
pub fn get(&self, x: &DefId) -> Option<&PathLike<'a>> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should really not be a reference ( |
||
self.inner.get(x) | ||
} | ||
|
||
pub fn build_fn_decl(decl: &'a FnDecl) -> Self { | ||
let mut builder = Self::build(); | ||
builder.add_fndecl(decl); | ||
builder.finnish() | ||
} | ||
|
||
pub fn build_fn(f: &'a Function) -> Self { | ||
let mut builder = Self::build(); | ||
builder.add_fn(f); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please directly call |
||
builder.finnish() | ||
} | ||
} | ||
|
||
enum AmbiguityTableBuilderEntry { | ||
MapsToOne(DefId), | ||
IsAmbiguous, | ||
} | ||
|
||
pub struct AmbiguityTableBuilder<'a> { | ||
inner: FxHashMap<PathLike<'a>, AmbiguityTableBuilderEntry>, | ||
} | ||
|
||
impl<'a> AmbiguityTableBuilder<'a> { | ||
// Invariant: must start with length 1 path view | ||
fn add_path_view(&mut self, p: PathLike<'a>, did: DefId) { | ||
use std::collections::hash_map::Entry::*; | ||
match self.inner.entry(p.clone()) { | ||
Occupied(entry) => { | ||
match entry.get() { | ||
AmbiguityTableBuilderEntry::MapsToOne(other_did) if other_did == &did => return, | ||
_ => (), | ||
} | ||
let (other_p, v) = entry.replace_entry(AmbiguityTableBuilderEntry::IsAmbiguous); | ||
// dbg!(&other_p, &p); | ||
match v { | ||
AmbiguityTableBuilderEntry::MapsToOne(other_did) => { | ||
self.add_path_view(other_p.make_longer(), other_did) | ||
} | ||
AmbiguityTableBuilderEntry::IsAmbiguous => (), | ||
} | ||
self.add_path_view(p.make_longer(), did) | ||
} | ||
Vacant(entry) => { | ||
entry.insert(AmbiguityTableBuilderEntry::MapsToOne(did)); | ||
} | ||
} | ||
} | ||
|
||
fn add_path(&mut self, path: &'a clean::Path) { | ||
let pv = PathLike { path, suffix_len: 1 }; | ||
self.add_path_view(pv, path.def_id()) | ||
} | ||
|
||
fn add_generic_bound(&mut self, generic_bound: &'a clean::GenericBound) { | ||
match generic_bound { | ||
clean::GenericBound::TraitBound(poly_trait, _) => self.add_poly_trait(poly_trait), | ||
clean::GenericBound::Outlives(_) => (), | ||
} | ||
} | ||
|
||
fn add_poly_trait(&mut self, poly_trait: &'a clean::PolyTrait) { | ||
self.add_path(&poly_trait.trait_); | ||
for gen_param in &poly_trait.generic_params { | ||
use clean::GenericParamDefKind::*; | ||
match &gen_param.kind { | ||
Type { bounds, .. } => { | ||
for bnd in bounds { | ||
self.add_generic_bound(bnd) | ||
} | ||
} | ||
Lifetime { .. } | Const { .. } => (), | ||
} | ||
} | ||
} | ||
|
||
fn add_type(&mut self, ty: &'a clean::Type) { | ||
match ty { | ||
clean::Type::Path { path } => self.add_path(path), | ||
clean::Type::Tuple(tys) => { | ||
for ty in tys { | ||
self.add_type(ty) | ||
} | ||
} | ||
clean::Type::RawPointer(_, ty) | ||
| clean::Type::Slice(ty) | ||
| clean::Type::BorrowedRef { type_: ty, .. } | ||
| clean::Type::Array(ty, _) => self.add_type(ty), | ||
|
||
clean::Type::DynTrait(poly_trait, _) => { | ||
for trai in poly_trait { | ||
self.add_poly_trait(trai) | ||
} | ||
} | ||
|
||
clean::Type::BareFunction(bare_func_decl) => { | ||
let clean::FnDecl { output, inputs, .. } = &bare_func_decl.decl; | ||
self.add_type(output); | ||
for inpt in &inputs.values { | ||
self.add_type(&inpt.type_) | ||
} | ||
} | ||
clean::Type::ImplTrait(bnds) => { | ||
for bnd in bnds { | ||
self.add_generic_bound(bnd) | ||
} | ||
} | ||
clean::Type::Infer | ||
| clean::Type::QPath(_) | ||
| clean::Type::Primitive(_) | ||
| clean::Type::Generic(_) => (), | ||
} | ||
} | ||
|
||
fn add_fndecl(&mut self, decl: &'a FnDecl) { | ||
for arg in &decl.inputs.values { | ||
self.add_type(&arg.type_); | ||
} | ||
self.add_type(&decl.output); | ||
} | ||
|
||
pub fn add_fn(&mut self, f: &'a Function) { | ||
self.add_fndecl(&f.decl); | ||
} | ||
|
||
pub fn finnish(self) -> AmbiguityTable<'a> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Northern countries are now part of rust. 😄 ("finnish" with two "n") |
||
let mut inner = FxHashMap::default(); | ||
for (path_view, did) in self.inner { | ||
if let AmbiguityTableBuilderEntry::MapsToOne(did) = did { | ||
let hopefully_none = inner.insert(did, path_view); | ||
assert!(hopefully_none.is_none()); | ||
} | ||
} | ||
AmbiguityTable { inner } | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be worth adding a comment explaining how the path ambiguities are handled at the top of the file.