diff --git a/shared b/shared index aeef4e39..ccc289ed 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit aeef4e39dce770e5075a6282b8e81479e27d0ef0 +Subproject commit ccc289edec6fe45b2987e4f3983d787396f2fe81 diff --git a/src/entities-and-resolution.rst b/src/entities-and-resolution.rst index b1597243..f1276e49 100644 --- a/src/entities-and-resolution.rst +++ b/src/entities-and-resolution.rst @@ -937,8 +937,8 @@ The :dt:`core prelude` is a :t:`prelude` that brings :t:`in scope` of every An :dt:`external prelude` is a :t:`prelude` that brings :t:`in scope` of the :t:`crate root module` the :t:`entities ` of the :t:`[crate]s` imported using external :t:`[crate import]s`. If the external :t:`crate import` uses a -:t:`renaming`, then the :t:`renaming` is instead added to the -:t:`external prelude`. The core :t:`crate` is always added to the +:t:`renaming`, then the :t:`identifier of the `:t:`renaming` is instead added to +the :t:`external prelude`. The core :t:`crate` is always added to the :t:`external prelude` unless the :t:`crate root` is subject to :t:`attribute` ``no_core``. @@ -1091,8 +1091,13 @@ A :t:`simple import` brings :t:`[name]s` into :t:`scope` as follows: :dp:`fls_FILuR3pfwjw3` An :t:`Entity` imported by a :t:`simple import` subject to a -:t:`renaming` is brought into :t:`scope` under the :t:`name` declared by the -renaming. +:t:`renaming` with :t:`identifier` is brought into :t:`scope` under the +:t:`name` declared by the :t:`renaming`. + +:dp:`fls_iQOgxNihUEr7` +A :t:`trait` imported by a :t:`simple import` subject to a +:t:`renaming` with character underscore ``_`` is added into :t:`scope` without +a :t:`name`. :dp:`fls_ldr7tsuqw34s` A :t:`nesting import` is a :t:`use import` that provides a common diff --git a/src/program-structure-and-compilation.rst b/src/program-structure-and-compilation.rst index 48d25e16..5f44ffb2 100644 --- a/src/program-structure-and-compilation.rst +++ b/src/program-structure-and-compilation.rst @@ -164,9 +164,9 @@ A :t:`crate import` binds an external :t:`crate` to its :t:`crate indication`. :t:`Crate indication` ``self`` shall require a :t:`renaming`. :dp:`fls_siv8bl6s2ndu` -A :t:`crate import` with a :t:`renaming` binds the external :t:`crate` to -a local :t:`name` and introduces the local :t:`name` into the enclosing -:t:`scope`. +A :t:`crate import` with a :t:`renaming` with an :t:`identifier` binds the +external :t:`crate` to a local :t:`name` and introduces the local :t:`name` into +the enclosing :t:`scope`. :dp:`fls_7vz5n3x6jo1s` If a :t:`crate import` appears at the :t:`crate root module`, then the