Abbreviate expansion.

Author: cjgillot

compiler/rustc_expand/src/expand.rs

@@ -486,7 +486,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                                 .map(|(path, item, _exts, is_const)| {
                                     // FIXME: Consider using the derive resolutions (`_exts`)
                                     // instead of enqueuing the derives to be resolved again later.
-                                    let expn_id = LocalExpnId::reserve_expansion_id();
+                                    let expn_id = LocalExpnId::reserve_expn_id();
                                     derive_invocations.push((
                                         Invocation {
                                             kind: InvocationKind::Derive { path, item, is_const },
@@ -1548,7 +1548,7 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
     }
 
     fn collect(&mut self, fragment_kind: AstFragmentKind, kind: InvocationKind) -> AstFragment {
-        let expn_id = LocalExpnId::reserve_expansion_id();
+        let expn_id = LocalExpnId::reserve_expn_id();
         let vis = kind.placeholder_visibility();
         self.invocations.push((
             Invocation {

compiler/rustc_middle/src/ty/context.rs

@@ -909,26 +909,21 @@ impl<'tcx> TyCtxt<'tcx> {
 
 impl<'tcx> TyCtxt<'tcx> {
     #[instrument(level = "trace", skip(self), ret)]
-    pub fn create_expansion(self, expn_data: ExpnData) -> LocalExpnId {
+    pub fn create_expn(self, expn_data: ExpnData) -> LocalExpnId {
         tls::with_related_context(self, |icx| {
             let CurrentDepNode::Regular { dep_node, expn_disambiguators } = icx.current_node else {
                 bug!("creating an expansion outside of a query")
             };
             self.with_stable_hashing_context(|ctx| {
-                LocalExpnId::create_untracked_expansion(
-                    expn_data,
-                    dep_node,
-                    ctx,
-                    &expn_disambiguators,
-                )
+                LocalExpnId::create_untracked_expn(expn_data, dep_node, ctx, &expn_disambiguators)
             })
         })
     }
 
     /// Fill an empty expansion. This method must not be used outside of the resolver.
     #[inline]
     #[instrument(level = "trace", skip(self))]
-    pub fn finalize_expansion(self, expn_id: LocalExpnId, expn_data: ExpnData) {
+    pub fn finalize_expn(self, expn_id: LocalExpnId, expn_data: ExpnData) {
         tls::with_related_context(self, |icx| {
             let CurrentDepNode::Regular { dep_node, expn_disambiguators } = icx.current_node else {
                 bug!("creating an expansion outside of a query")
@@ -951,7 +946,7 @@ impl<'tcx> TyCtxt<'tcx> {
         let mut expn_data =
             ExpnData::default(ExpnKind::Desugaring(reason), span, edition, None, None);
         expn_data.allow_internal_unstable = allow_internal_unstable;
-        let expn_id = self.create_expansion(expn_data);
+        let expn_id = self.create_expn(expn_data);
         span.fresh_expansion(expn_id)
     }
 }

compiler/rustc_resolve/src/macros.rs

@@ -217,7 +217,7 @@ impl<'a, 'tcx> ResolverExpand for Resolver<'a, 'tcx> {
     ) -> LocalExpnId {
         let parent_module =
             parent_module_id.map(|module_id| self.local_def_id(module_id).to_def_id());
-        let expn_id = self.tcx.create_expansion(ExpnData::allow_unstable(
+        let expn_id = self.tcx.create_expn(ExpnData::allow_unstable(
             ExpnKind::AstPass(pass),
             call_site,
             self.tcx.sess.edition(),
@@ -287,7 +287,7 @@ impl<'a, 'tcx> ResolverExpand for Resolver<'a, 'tcx> {
 
         let span = invoc.span();
         let def_id = res.opt_def_id();
-        self.tcx.finalize_expansion(
+        self.tcx.finalize_expn(
             invoc_id,
             ext.expn_data(
                 parent_scope.expansion,

compiler/rustc_span/src/hygiene.rs

@@ -182,7 +182,7 @@ impl LocalExpnId {
 
     /// Create a new expansions without any information. This method must not be used outside of
     /// the resolver.
-    pub fn reserve_expansion_id() -> LocalExpnId {
+    pub fn reserve_expn_id() -> LocalExpnId {
         HygieneData::with(|data| {
             let expn_id = data.local_expn_data.push(None);
             let _eid = data.local_expn_hashes.push(ExpnHash(Fingerprint::ZERO));
@@ -191,9 +191,9 @@ impl LocalExpnId {
         })
     }
 
-    /// This method is an implementation detail of `TyCtxt::create_expansion`.
+    /// This method is an implementation detail of `TyCtxt::create_expn`.
     #[instrument(level = "trace", skip(ctx), ret)]
-    pub fn create_untracked_expansion(
+    pub fn create_untracked_expn(
         mut expn_data: ExpnData,
         hash_extra: impl Hash + Copy + fmt::Debug,
         ctx: impl HashStableContext,
@@ -213,7 +213,7 @@ impl LocalExpnId {
         })
     }
 
-    /// Implementation detail of `TyCtxt::finalize_expansion`.
+    /// Implementation detail of `TyCtxt::finalize_expn`.
     #[inline]
     #[instrument(level = "trace", skip(ctx))]
     pub fn set_untracked_expn_data(

src/librustdoc/passes/lint/check_code_block_syntax.rs

@@ -47,7 +47,7 @@ fn check_rust_syntax(
     let edition = code_block.lang_string.edition.unwrap_or_else(|| cx.tcx.sess.edition());
     let expn_data =
         ExpnData::default(ExpnKind::AstPass(AstPass::TestHarness), DUMMY_SP, edition, None, None);
-    let expn_id = cx.tcx.create_expansion(expn_data);
+    let expn_id = cx.tcx.create_expn(expn_data);
     let span = DUMMY_SP.fresh_expansion(expn_id);
 
     let is_empty = rustc_driver::catch_fatal_errors(|| {