Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Reference lang items during AST lowering #75145

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
merged 9 commits into from
Aug 17, 2020
Merged

Reference lang items during AST lowering #75145

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
764dc3d
lang_items: add support for lang items on variants
davidtwco Aug 4, 2020
734441c
tests: add test for #61019's current behaviour
davidtwco Aug 4, 2020
7dee5f8
hir: introduce lang items for AST lowering
davidtwco Aug 4, 2020
762137e
hir: introduce `QPath::LangItem`
davidtwco Aug 4, 2020
1e2f350
save_analysis: support `QPath::LangItem`
davidtwco Aug 4, 2020
664ecf1
hir: simplify `is_range_literal`
davidtwco Aug 4, 2020
8367af4
resolve: support `GenericBound::LangItemTrait`
davidtwco Aug 4, 2020
dde93c9
rustdoc: clean `QPath::LangItem`
davidtwco Aug 4, 2020
f1ce294
clippy: support `QPath::LangItem`
davidtwco Aug 4, 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
resolve: support GenericBound::LangItemTrait 
This commit modifies name resolution to ensure that new scopes are
introduced from lang-item generic bounds.

Co-authored-by: Matthew Jasper <[email protected]>
Signed-off-by: David Wood <[email protected]>
  • Loading branch information
@davidtwco @matthewjasper
davidtwco and matthewjasper committed Aug 16, 2020
commit 8367af469b9005c8f5c1777a48548a80e4658076
28 changes: 28 additions & 0 deletions src/librustc_resolve/late/lifetimes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,24 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
}
}

fn visit_param_bound(&mut self, bound: &'tcx hir::GenericBound<'tcx>) {
match bound {
hir::GenericBound::LangItemTrait { .. } if !self.trait_ref_hack => {
let scope = Scope::Binder {
lifetimes: FxHashMap::default(),
s: self.scope,
next_early_index: self.next_early_index(),
track_lifetime_uses: true,
opaque_type_parent: false,
};
self.with(scope, |_, this| {
intravisit::walk_param_bound(this, bound);
});
}
_ => intravisit::walk_param_bound(self, bound),
}
}

fn visit_poly_trait_ref(
&mut self,
trait_ref: &'tcx hir::PolyTraitRef<'tcx>,
Expand Down Expand Up @@ -2296,6 +2314,16 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
self.outer_index.shift_out(1);
}

fn visit_param_bound(&mut self, bound: &hir::GenericBound<'_>) {
if let hir::GenericBound::LangItemTrait { .. } = bound {
self.outer_index.shift_in(1);
intravisit::walk_param_bound(self, bound);
self.outer_index.shift_out(1);
} else {
intravisit::walk_param_bound(self, bound);
}
}

fn visit_lifetime(&mut self, lifetime_ref: &hir::Lifetime) {
if let Some(&lifetime) = self.map.defs.get(&lifetime_ref.hir_id) {
match lifetime {
Expand Down