diff options
| author | bors <bors@rust-lang.org> | 2023-05-28 18:04:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-28 18:04:53 +0000 |
| commit | 1c53407e8c7cc922d718bde61ca34f47b6d2120f (patch) | |
| tree | cb51d4703b9467f6794bdee1a94df3909c2017b1 /compiler/rustc_middle/src/ty/mod.rs | |
| parent | 3fae1b9fc35fc449186e2138bdf8ee75dac78dae (diff) | |
| parent | c29c212f8dc80e40f099b6dbc9da3111177ba7bf (diff) | |
| download | rust-1c53407e8c7cc922d718bde61ca34f47b6d2120f.tar.gz rust-1c53407e8c7cc922d718bde61ca34f47b6d2120f.zip | |
Auto merge of #112006 - kylematsuda:earlybinder-private, r=jackh726
Make `EarlyBinder`'s inner value private Currently, `EarlyBinder(T)`'s inner value is public, which allows implicitly skipping the binder by indexing into the tuple struct (i.e., `x.0`). `@lcnr` suggested making `EarlyBinder`'s inner value private so users are required to explicitly call `skip_binder` (https://github.com/rust-lang/rust/issues/105779#issuecomment-1549933424) . This PR makes the inner value private, adds `EarlyBinder::new` for constructing a new instance, and replaces uses of `x.0` with `x.skip_binder()` (or similar). It also adds some documentation to `EarlyBinder::skip_binder` explaining how to skip the binder of `&EarlyBinder<T>` to get `&T` now that the inner value is private (since previously we could just do `&x.0`). r? `@lcnr`
Diffstat (limited to 'compiler/rustc_middle/src/ty/mod.rs')
| -rw-r--r-- | compiler/rustc_middle/src/ty/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs index 96023a68cf6..4b2c7e8ef31 100644 --- a/compiler/rustc_middle/src/ty/mod.rs +++ b/compiler/rustc_middle/src/ty/mod.rs @@ -764,7 +764,7 @@ impl<'tcx> Predicate<'tcx> { let shifted_pred = tcx.shift_bound_var_indices(trait_bound_vars.len(), bound_pred.skip_binder()); // 2) Self: Bar1<'a, '^0.1> -> T: Bar1<'^0.0, '^0.1> - let new = EarlyBinder(shifted_pred).subst(tcx, trait_ref.skip_binder().substs); + let new = EarlyBinder::new(shifted_pred).subst(tcx, trait_ref.skip_binder().substs); // 3) ['x] + ['b] -> ['x, 'b] let bound_vars = tcx.mk_bound_variable_kinds_from_iter(trait_bound_vars.iter().chain(pred_bound_vars)); |
