Skip to content

small coherence cleanup #74454

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.

Sign up for GitHub

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

Merged
bors merged 4 commits into from
Jul 22, 2020
Merged

small coherence cleanup #74454

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5300ca3
cleanup ty_is_~non~_local_constructor
lcnr Jul 17, 2020
1ac3713
refactor ty_is_non_local
lcnr Jul 17, 2020
c71b196
review
lcnr Jul 20, 2020
cfcbca6
update coherence docs
lcnr Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review
  • Loading branch information
@lcnr
lcnr committed Jul 20, 2020
commit c71b196f66d110291a67c3bbc0f8fdb11a261f1f
11 changes: 10 additions & 1 deletion src/librustc_trait_selection/traits/coherence.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,15 @@ fn orphan_check_trait_ref<'tcx>(
///
/// This is just `ty` itself unless `ty` is `#[fundamental]`,
/// in which case we recursively look into this type.
///
/// If `ty` is local itself, this method returns an empty `Vec`.
///
/// # Examples
///
/// - `u32` is not local, so this returns `[u32]`.
/// - for `Foo<u32>`, where `Foo` is a local type, this returns `[]`.
/// - `&mut u32` returns `[u32]`, as `&mut` is a fundamental type, similar to `Box`.
/// - `Box<Foo<u32>>` returns `[]`, as `Box` is a fundamental type and `Foo` is local.
fn contained_non_local_types(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, in_crate: InCrate) -> Vec<Ty<'tcx>> {
if ty_is_local_constructor(ty, in_crate) {
Vec::new()
Expand Down Expand Up @@ -493,7 +502,7 @@ fn def_id_is_local(def_id: DefId, in_crate: InCrate) -> bool {
}

fn ty_is_local_constructor(ty: Ty<'_>, in_crate: InCrate) -> bool {
debug!("ty_is_non_local_constructor({:?})", ty);
debug!("ty_is_local_constructor({:?})", ty);

match ty.kind {
ty::Bool
Expand Down