nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-27 07:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustdoc: Remove unnecessary Cell around param_env

Browse Source
This commit is contained in:
Camelid 2021-02-20 17:12:22 -08:00
parent d2b38d6b3c
commit 6a85719b6a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustdoc/clean/mod.rs
View File

@ -1519,7 +1519,7 @@ fn normalize(cx: &mut DocContext<'tcx>, ty: Ty<'_>) -> Option<Ty<'tcx>> {
let lifted = ty.lift_to_tcx(cx.tcx).unwrap(); let lifted = ty.lift_to_tcx(cx.tcx).unwrap();
let normalized = cx.tcx.infer_ctxt().enter(|infcx| { let normalized = cx.tcx.infer_ctxt().enter(|infcx| {
infcx infcx
.at(&ObligationCause::dummy(), cx.param_env.get()) .at(&ObligationCause::dummy(), cx.param_env)
.normalize(lifted) .normalize(lifted)
.map(|resolved| infcx.resolve_vars_if_possible(resolved.value)) .map(|resolved| infcx.resolve_vars_if_possible(resolved.value))
}); });

13
src/librustdoc/core.rs
View File

@ -26,10 +26,7 @@ use rustc_span::DUMMY_SP;
use std::mem; use std::mem;
use std::rc::Rc; use std::rc::Rc;
use std::{ use std::{cell::RefCell, collections::hash_map::Entry};
cell::{Cell, RefCell},
collections::hash_map::Entry,
};
use crate::clean; use crate::clean;
use crate::clean::inline::build_external_trait; use crate::clean::inline::build_external_trait;
@ -49,7 +46,7 @@ crate struct DocContext<'tcx> {
/// Used for normalization. /// Used for normalization.
/// ///
/// Most of this logic is copied from rustc_lint::late. /// Most of this logic is copied from rustc_lint::late.
crate param_env: Cell<ParamEnv<'tcx>>, crate param_env: ParamEnv<'tcx>,
/// Later on moved into `cache` /// Later on moved into `cache`
crate renderinfo: RefCell<RenderInfo>, crate renderinfo: RefCell<RenderInfo>,
/// Later on moved through `clean::Crate` into `cache` /// Later on moved through `clean::Crate` into `cache`
@ -89,9 +86,9 @@ impl<'tcx> DocContext<'tcx> {
} }
crate fn with_param_env<T, F: FnOnce(&mut Self) -> T>(&mut self, def_id: DefId, f: F) -> T { crate fn with_param_env<T, F: FnOnce(&mut Self) -> T>(&mut self, def_id: DefId, f: F) -> T {
let old_param_env = self.param_env.replace(self.tcx.param_env(def_id)); let old_param_env = mem::replace(&mut self.param_env, self.tcx.param_env(def_id));
let ret = f(self); let ret = f(self);
self.param_env.set(old_param_env); self.param_env = old_param_env;
ret ret
} }
@ -511,7 +508,7 @@ crate fn run_global_ctxt(
let mut ctxt = DocContext { let mut ctxt = DocContext {
tcx, tcx,
resolver, resolver,
param_env: Cell::new(ParamEnv::empty()), param_env: ParamEnv::empty(),
external_traits: Default::default(), external_traits: Default::default(),
active_extern_traits: Default::default(), active_extern_traits: Default::default(),
renderinfo: RefCell::new(renderinfo), renderinfo: RefCell::new(renderinfo),