Skip to content

Commit d06d50c

Browse files
committed
Rename some session variables from s to sess.
Because `sess` is the standard name.
1 parent cbf22e6 commit d06d50c

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

compiler/rustc_middle/src/ty/context.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ impl<'tcx> TyCtxt<'tcx> {
10161016
/// has a valid reference to the context, to allow formatting values that need it.
10171017
pub fn create_global_ctxt<T>(
10181018
gcx_cell: &'tcx OnceLock<GlobalCtxt<'tcx>>,
1019-
s: &'tcx Session,
1019+
sess: &'tcx Session,
10201020
crate_types: Vec<CrateType>,
10211021
stable_crate_id: StableCrateId,
10221022
arena: &'tcx WorkerLocal<Arena<'tcx>>,
@@ -1030,24 +1030,24 @@ impl<'tcx> TyCtxt<'tcx> {
10301030
jobserver_proxy: Arc<Proxy>,
10311031
f: impl FnOnce(TyCtxt<'tcx>) -> T,
10321032
) -> T {
1033-
let data_layout = s.target.parse_data_layout().unwrap_or_else(|err| {
1034-
s.dcx().emit_fatal(err);
1033+
let data_layout = sess.target.parse_data_layout().unwrap_or_else(|err| {
1034+
sess.dcx().emit_fatal(err);
10351035
});
10361036
let interners = CtxtInterners::new(arena);
10371037
let common_types = CommonTypes::new(&interners);
10381038
let common_lifetimes = CommonLifetimes::new(&interners);
10391039
let common_consts = CommonConsts::new(&interners, &common_types);
10401040

10411041
let gcx = gcx_cell.get_or_init(|| GlobalCtxt {
1042-
sess: s,
1042+
sess,
10431043
crate_types,
10441044
stable_crate_id,
10451045
arena,
10461046
hir_arena,
10471047
interners,
10481048
dep_graph,
10491049
hooks,
1050-
prof: s.prof.clone(),
1050+
prof: sess.prof.clone(),
10511051
types: common_types,
10521052
lifetimes: common_lifetimes,
10531053
consts: common_consts,

0 commit comments

Comments
 (0)