Skip to content

Commit 97f3191

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

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

compiler/rustc_middle/src/ty/context.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ impl<'tcx> TyCtxt<'tcx> {
10731073
/// has a valid reference to the context, to allow formatting values that need it.
10741074
pub fn create_global_ctxt<T>(
10751075
gcx_cell: &'tcx OnceLock<GlobalCtxt<'tcx>>,
1076-
s: &'tcx Session,
1076+
sess: &'tcx Session,
10771077
crate_types: Vec<CrateType>,
10781078
stable_crate_id: StableCrateId,
10791079
arena: &'tcx WorkerLocal<Arena<'tcx>>,
@@ -1087,24 +1087,24 @@ impl<'tcx> TyCtxt<'tcx> {
10871087
jobserver_proxy: Arc<Proxy>,
10881088
f: impl FnOnce(TyCtxt<'tcx>) -> T,
10891089
) -> T {
1090-
let data_layout = s.target.parse_data_layout().unwrap_or_else(|err| {
1091-
s.dcx().emit_fatal(err);
1090+
let data_layout = sess.target.parse_data_layout().unwrap_or_else(|err| {
1091+
sess.dcx().emit_fatal(err);
10921092
});
10931093
let interners = CtxtInterners::new(arena);
1094-
let common_types = CommonTypes::new(&interners, s, &untracked);
1094+
let common_types = CommonTypes::new(&interners, sess, &untracked);
10951095
let common_lifetimes = CommonLifetimes::new(&interners);
1096-
let common_consts = CommonConsts::new(&interners, &common_types, s, &untracked);
1096+
let common_consts = CommonConsts::new(&interners, &common_types, sess, &untracked);
10971097

10981098
let gcx = gcx_cell.get_or_init(|| GlobalCtxt {
1099-
sess: s,
1099+
sess,
11001100
crate_types,
11011101
stable_crate_id,
11021102
arena,
11031103
hir_arena,
11041104
interners,
11051105
dep_graph,
11061106
hooks,
1107-
prof: s.prof.clone(),
1107+
prof: sess.prof.clone(),
11081108
types: common_types,
11091109
lifetimes: common_lifetimes,
11101110
consts: common_consts,

0 commit comments

Comments
 (0)