Skip to content

Conversation

sriganeshres
Copy link
Contributor

gcc/rust/ChangeLog:

* resolve/rust-ast-resolve-base.h (redefined_error): created a function for rust_error_at for redefined at multiple times.
* resolve/rust-ast-resolve-implitem.h: changed rust_error_at to redefined_error.
* resolve/rust-ast-resolve-stmt.cc (ResolveStmt::visit): changed rust_error_at to redefined_error.
* resolve/rust-ast-resolve-stmt.h: changed rust_error_at to redefined_error.
* resolve/rust-ast-resolve-toplevel.h: changed rust_error_at to redefined_error.

@sriganeshres sriganeshres force-pushed the refactor-multiple branch 3 times, most recently from cc9e670 to 2f256db Compare March 19, 2025 12:30
@sriganeshres
Copy link
Contributor Author

@CohenArthur Take a look at this pull request

Copy link
Member

@CohenArthur CohenArthur left a comment

Choose a reason for hiding this comment

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

the code looks good! could you check that this doesn't conflict with the changes @powerboat9 made in #3519? just rebasing your code on the most recent master once #3519 is merged will be enough. thanks!

@sriganeshres
Copy link
Contributor Author

I have solved the merge conflicts.

@powerboat9
Copy link
Collaborator

You should modify the PR so it doesn't contain merge commits. It looks like an easy way to do that in your case would be to run git reset --soft b79c452 and then git gcc-commit-mklog again -- although you should be prepared to copy-paste your existing commit message as your new commit message, if you don't want to have to retype it.

@sriganeshres sriganeshres force-pushed the refactor-multiple branch 2 times, most recently from d71ab54 to e5b2fbc Compare March 25, 2025 13:09
@sriganeshres
Copy link
Contributor Author

I have solved the merge conflict

Copy link
Member

@philberty philberty left a comment

Choose a reason for hiding this comment

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

I dont think "chore" is a good term in the git commit message. Just do:

gccrs: refactor error diagnostic so it can be reused.

gcc/rust/ChangeLog:

	* resolve/rust-ast-resolve-base.h (redefined_error): created a function for
	rust_error_at for redefined at multiple times.
	* resolve/rust-ast-resolve-implitem.h: changed rust_error_at to redefined_error.
	* resolve/rust-ast-resolve-stmt.cc (ResolveStmt::visit): changed rust_error_at to
	redefined_error.
	* resolve/rust-ast-resolve-stmt.h: changed rust_error_at to redefined_error.
	* resolve/rust-ast-resolve-toplevel.h: changed rust_error_at to redefined_error.

Signed-off-by: Sri Ganesh Thota <[email protected]>
@sriganeshres
Copy link
Contributor Author

sriganeshres commented Mar 31, 2025

@philberty i have changed the name

@P-E-P P-E-P requested a review from philberty April 4, 2025 12:21
@P-E-P P-E-P added the cleanup label Apr 4, 2025
Copy link
Member

@philberty philberty left a comment

Choose a reason for hiding this comment

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

LGTM

@philberty philberty added this pull request to the merge queue Apr 4, 2025
Merged via the queue into Rust-GCC:master with commit 9554470 Apr 4, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor redefined multiple times Error
5 participants