Skip to content

devtools: Rename BrowsingContextActor variable names#43655

Merged
eerii merged 1 commit into
servo:mainfrom
sabbCodes:issue-43606-browsing-context-part-III
Mar 27, 2026
Merged

devtools: Rename BrowsingContextActor variable names#43655
eerii merged 1 commit into
servo:mainfrom
sabbCodes:issue-43606-browsing-context-part-III

Conversation

@sabbCodes

Copy link
Copy Markdown
Contributor

Renamed BrowsingContext in tab, network_event, watcher actors & lib.rs

Testing: No testing required - only renaming done
Fixes: Part o #43606

@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 25, 2026

@eerii eerii left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! You are missing a call to ./mach fmt but everything else looks good :)

@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Mar 25, 2026
@eerii eerii changed the title devtools: Renamed BrowsingContextActor in core files devtools: Rename BrowsingContextActor variable names Mar 25, 2026
@sabbCodes

Copy link
Copy Markdown
Contributor Author

Thanks! You are missing a call to ./mach fmt but everything else looks good :)

I must have missed it due to several commits I had to do as a result of merged PRs

@sabbCodes sabbCodes force-pushed the issue-43606-browsing-context-part-III branch from 4af8068 to 6f27673 Compare March 25, 2026 19:14
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 25, 2026
@eerii eerii enabled auto-merge March 25, 2026 19:25
@sabbCodes

Copy link
Copy Markdown
Contributor Author

Hi @eerii, can you please check what's failing this time?

I ran the /mach fmt already and something is still failing it seems

@Taym95

Taym95 commented Mar 25, 2026

Copy link
Copy Markdown
Member

Hi @eerii, can you please check what's failing this time?

I ran the /mach fmt already and something is still failing it seems

You need to run format again:


+        let browsing_context_actor = self
+            .registry
+            .find::<BrowsingContextActor>(browsing_context_name);
+        let thread = self
+            .registry
+            .find::<ThreadActor>(&browsing_context_actor.thread);
 
         let pause = self.registry.new_name::<PauseActor>();
         self.registry.register(PauseActor {
Diff in /home/runner/work/servo/servo/components/devtools/lib.rs:829:
             return;
         };
 
-        let browsing_context_actor = self.registry.find::<BrowsingContextActor>(browsing_context_name);
-        let thread = self.registry.find::<ThreadActor>(&browsing_context_actor.thread);
+        let browsing_context_actor = self
+            .registry
+            .find::<BrowsingContextActor>(browsing_context_name);
+        let thread = self
+            .registry
+            .find::<ThreadActor>(&browsing_context_actor.thread);
 
         let source = match thread
             .source_manager

 ➤  Checking formatting of python files...

 ➤  Checking formatting of toml files...


 ❌ test-tidy reported errors.
Run `./mach fmt` to fix the formatting

@eerii

eerii commented Mar 25, 2026

Copy link
Copy Markdown
Member

Did you add your changes and committed before doing the push? Because it seems that it didn't change anything between two versions. It has definitely happened to me before :)

./mach fmt
git commit -a -s "fix formatting"
git push

auto-merge was automatically disabled March 25, 2026 20:10

Head branch was pushed to by a user without write access

@sabbCodes sabbCodes force-pushed the issue-43606-browsing-context-part-III branch from 6f27673 to 1a63e38 Compare March 25, 2026 20:10
@sabbCodes

Copy link
Copy Markdown
Contributor Author

Did you add your changes and committed before doing the push? Because it seems that it didn't change anything between two versions. It has definitely happened to me before :)

./mach fmt
git commit -a -s "fix formatting"
git push

You're right, lol

Too many commands I forgot to git add before pushing

@eerii eerii enabled auto-merge March 25, 2026 20:21
@eerii eerii added this pull request to the merge queue Mar 25, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 25, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Mar 25, 2026
@servo-highfive servo-highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 25, 2026
@sabbCodes sabbCodes force-pushed the issue-43606-browsing-context-part-III branch from 1a63e38 to c0b1610 Compare March 26, 2026 03:19
@servo-highfive servo-highfive removed the S-needs-rebase There are merge conflict errors. label Mar 26, 2026
@eerii eerii added this pull request to the merge queue Mar 26, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 26, 2026
@eerii eerii removed this pull request from the merge queue due to a manual request Mar 26, 2026
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 26, 2026
@eerii

eerii commented Mar 26, 2026

Copy link
Copy Markdown
Member

Apologies for taking this out of the merge queue, it had some conflicts in watcher.rs. Let's wait until #43472 is merged, since that also modifies the same parts of the lib.rs file.

@sabbCodes

Copy link
Copy Markdown
Contributor Author

Apologies for taking this out of the merge queue, it had some conflicts in watcher.rs. Let's wait until #43472 is merged, since that also modifies the same parts of the lib.rs file.

Okay, but #43472 now looks merged, can I rebase?

@eerii

eerii commented Mar 26, 2026

Copy link
Copy Markdown
Member

Yes, thanks!

Signed-off-by: Sabb <sarafaabbas@gmail.com>
@sabbCodes sabbCodes force-pushed the issue-43606-browsing-context-part-III branch from c0b1610 to 5e4325c Compare March 26, 2026 19:29
@sabbCodes

Copy link
Copy Markdown
Contributor Author

Yes, thanks!

Can you review the commit, @eerii?

@eerii eerii added this pull request to the merge queue Mar 27, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 27, 2026
Merged via the queue into servo:main with commit b707a59 Mar 27, 2026
30 checks passed
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-awaiting-review There is new code that needs to be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants