[move-compiler] Remove WarningFiltersScope from CompilationEnv #20065
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Skipped Deployments
|
cgswords
reviewed
Oct 29, 2024
external-crates/move/crates/move-compiler/src/naming/translate.rs
Outdated
Show resolved
Hide resolved
cgswords
reviewed
Oct 29, 2024
Comment on lines
61
to
77
| pub fn add_diag(&self, diag: Diagnostic) { | ||
| self.env.add_diag(&self.warning_filters_scope, diag); | ||
| } | ||
|
|
||
| #[allow(unused)] | ||
| pub fn add_diags(&self, diags: Diagnostics) { | ||
| self.env.add_diags(&self.warning_filters_scope, diags); | ||
| } | ||
|
|
||
| pub fn add_warning_filter_scope(&mut self, filters: WarningFilters) { | ||
| self.warning_filters_scope.push(filters) | ||
| } | ||
|
|
||
| pub fn pop_warning_filter_scope(&mut self) { | ||
| self.warning_filters_scope.pop() | ||
| } | ||
|
|
There was a problem hiding this comment.
Instead of repeating this pattern several places, what about something like:
struct DiagnosticReporter {
diags: Arc<RwLock<Diagnostics>>,
warning_filters: ...
}
impl DiagnosticReporter {
pub fn add_diag(&self, diag: Diagnostic) {
self.env.add_diag(&self.warning_filters_scope, diag);
}
#[allow(unused)]
pub fn add_diags(&self, diags: Diagnostics) {
self.env.add_diags(&self.warning_filters_scope, diags);
}
pub fn add_warning_filter_scope(&mut self, filters: WarningFilters) {
self.warning_filters_scope.push(filters)
}
pub fn pop_warning_filter_scope(&mut self) {
self.warning_filters_scope.pop()
}
}
And tne for the env:
impl CompilationEnv {
fn diag_reporter() -> {
DiagnosticReporter {
diags: Arc::clone(self.diags),
warning_filters: self.top_level_warning_filter_scope().clone(),
}
}
}
Then we can hold/reuse this in local scopes, easing the pressure of the rewrite and simplifying some of the changes.
There was a problem hiding this comment.
Let's make some progress on this offline. I think it would make this large PR a bit too large.
I'm fine making iterative progress here, even if eventually this entire PR is undone
cgswords
approved these changes
Oct 29, 2024
8 tasks
tnowacki
added a commit
that referenced
this pull request
Nov 1, 2024
## Description - Followup to #20065 - Better encapsulates warning filter scopes with diagnostic reporting ## Test plan - ran tests --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] REST API:
lxfind
pushed a commit
that referenced
this pull request
Nov 5, 2024
## Description - Followup to #20065 - Better encapsulates warning filter scopes with diagnostic reporting ## Test plan - ran tests --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] REST API:
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
Test plan
Release notes
Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required.
For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates.