-
Notifications
You must be signed in to change notification settings - Fork 5.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove DeRef
and DeRefMut
implementations in the namespace
module
#5577
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
esdrubal
reviewed
Feb 8, 2024
tritao
reviewed
Feb 8, 2024
tritao
approved these changes
Feb 8, 2024
esdrubal
approved these changes
Feb 8, 2024
sdankel
pushed a commit
that referenced
this pull request
Feb 8, 2024
…le (#5577) ## Description This PR is the first step of a large refactoring of the `namespace` module. The PR removes the `DeRef` and `DeRefMut` implementations in the `namespace` module, as they make refactoring more difficult to keep track of. This change means that calls to `Root` and `Module` must now explicitly go through `Namespace`, since that is the type that is passed along during typechecking. I'm submitting the PR now because there have been changes to `master` while I've been working on this, and the changes are really difficult to merge, so I want `master` to be relatively stable. Subsequent PRs will: - Eliminate the `dst` parameter from all import functions (the destination is always the current module). - Move all import functions to `Namespace` (they currently reside in `Module` where they aren't needed, and where they require a clone the module path to work). - Move `Namespace::init` to `Root`, and change how it is used (it currently holds a constant declaration of `CONTRACT_ID` for contract modules, and that declaration is cloned into every submodule. The nice way to do this is to declare it in the root module and implicitly import it into each submodule). - Eliminate the `Option` part of `Module::name` (modules are not allowed to be nameless - the option only exists because they root module can in principle be nameless, but it ought to be named based on the package the module structure is in). - Fix the import and name resolution functions so that they don't treat absolute paths as relative (this should fix some of the performance issues we're seeing). - Make `Namespace::root` a reference so that the entire module structure isn't cloned for every submodule (this requires a change in ownership of the root module). - Introduce reexports in the form of `pub use`. This PR is the first step in fixing #5498. ## Checklist - [x] I have linked to any relevant issues. - [x] I have commented my code, particularly in hard-to-understand areas. - [x] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [x] I have added tests that prove my fix is effective or that my feature works. - [x] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [x] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [x] I have requested a review from the relevant team or maintainers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR is the first step of a large refactoring of the
namespace
module.The PR removes the
DeRef
andDeRefMut
implementations in thenamespace
module, as they make refactoring more difficult to keep track of. This change means that calls toRoot
andModule
must now explicitly go throughNamespace
, since that is the type that is passed along during typechecking.I'm submitting the PR now because there have been changes to
master
while I've been working on this, and the changes are really difficult to merge, so I wantmaster
to be relatively stable.Subsequent PRs will:
dst
parameter from all import functions (the destination is always the current module).Namespace
(they currently reside inModule
where they aren't needed, and where they require a clone the module path to work).Namespace::init
toRoot
, and change how it is used (it currently holds a constant declaration ofCONTRACT_ID
for contract modules, and that declaration is cloned into every submodule. The nice way to do this is to declare it in the root module and implicitly import it into each submodule).Option
part ofModule::name
(modules are not allowed to be nameless - the option only exists because they root module can in principle be nameless, but it ought to be named based on the package the module structure is in).Namespace::root
a reference so that the entire module structure isn't cloned for every submodule (this requires a change in ownership of the root module).pub use
.This PR is the first step in fixing #5498.
Checklist
Breaking*
orNew Feature
labels where relevant.