diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-08 13:26:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 13:26:38 +0900 |
| commit | b7fadfddcbc7f7805bb2375bf3f2c61569a3ff71 (patch) | |
| tree | eea2cdc722374e4a8775b8259166512d2421b9d7 /compiler/rustc_resolve/src | |
| parent | a416e05d277c18d60f19ae2d149504fd7f9a5ba8 (diff) | |
| parent | fb92c92a7211c45f8361f2e865512dce244f3c96 (diff) | |
| download | rust-b7fadfddcbc7f7805bb2375bf3f2c61569a3ff71.tar.gz rust-b7fadfddcbc7f7805bb2375bf3f2c61569a3ff71.zip | |
Rollup merge of #86103 - camsteffen:lifetime-hack, r=jackh726
Remove lifetime hack It compiles without the hack. But I don't know why. I can't get the example in the referenced issue to compile...
Diffstat (limited to 'compiler/rustc_resolve/src')
| -rw-r--r-- | compiler/rustc_resolve/src/late/lifetimes.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/compiler/rustc_resolve/src/late/lifetimes.rs b/compiler/rustc_resolve/src/late/lifetimes.rs index efa5d7e7b11..ca7cdc4caf5 100644 --- a/compiler/rustc_resolve/src/late/lifetimes.rs +++ b/compiler/rustc_resolve/src/late/lifetimes.rs @@ -1841,14 +1841,6 @@ fn object_lifetime_defaults_for_item( } impl<'a, 'tcx> LifetimeContext<'a, 'tcx> { - // FIXME(#37666) this works around a limitation in the region inferencer - fn hack<F>(&mut self, f: F) - where - F: for<'b> FnOnce(&mut LifetimeContext<'b, 'tcx>), - { - f(self) - } - fn with<F>(&mut self, wrap_scope: Scope<'_>, f: F) where F: for<'b> FnOnce(ScopeRef<'_>, &mut LifetimeContext<'b, 'tcx>), @@ -2252,7 +2244,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> { }; self.with(scope, move |old_scope, this| { this.check_lifetime_params(old_scope, &generics.params); - this.hack(walk); // FIXME(#37666) workaround in place of `walk(this)` + walk(this); }); } |
