diff options
| author | bors <bors@rust-lang.org> | 2021-03-30 01:16:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-30 01:16:08 +0000 |
| commit | 902ca44c1953ad8f640e86d154c86cc1f5a3bde1 (patch) | |
| tree | a46df06066c2be5d86bcd1a57aada54b1c8cbf94 /compiler | |
| parent | 50489e3b0048af4df6f0a92bb43af8afce9b6652 (diff) | |
| parent | 6738ee7d59b2bdf82a25a3e0486b31df550c5598 (diff) | |
| download | rust-902ca44c1953ad8f640e86d154c86cc1f5a3bde1.tar.gz rust-902ca44c1953ad8f640e86d154c86cc1f5a3bde1.zip | |
Auto merge of #83664 - Dylan-DPC:rollup-wx6idpd, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #82331 (alloc: Added `as_slice` method to `BinaryHeap` collection) - #83130 (escape_ascii take 2) - #83374 (unix: Fix feature(unix_socket_ancillary_data) on macos and other BSDs) - #83543 (Lint on unknown intra-doc link disambiguators) - #83636 (Add a regression test for issue-82792) - #83643 (Remove a FIXME resolved by #73578) - #83644 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_middle/src/ty/util.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs index 9926cca2f51..9c7de250c29 100644 --- a/compiler/rustc_middle/src/ty/util.rs +++ b/compiler/rustc_middle/src/ty/util.rs @@ -699,7 +699,6 @@ impl<'tcx> ty::TyS<'tcx> { /// optimization as well as the rules around static values. Note /// that the `Freeze` trait is not exposed to end users and is /// effectively an implementation detail. - // FIXME: use `TyCtxtAt` instead of separate `Span`. pub fn is_freeze(&'tcx self, tcx_at: TyCtxtAt<'tcx>, param_env: ty::ParamEnv<'tcx>) -> bool { self.is_trivially_freeze() || tcx_at.is_freeze_raw(param_env.and(self)) } |