-
Notifications
You must be signed in to change notification settings - Fork 187
chore: refactoring rust_error_at "redefined multiple times" #3513
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
Conversation
cc9e670
to
2f256db
Compare
@CohenArthur Take a look at this pull request |
There was a problem hiding this 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!
I have solved the merge conflicts. |
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 |
d71ab54
to
e5b2fbc
Compare
I have solved the merge conflict |
There was a problem hiding this 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]>
e5b2fbc
to
3ada937
Compare
@philberty i have changed the name |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
gcc/rust/ChangeLog:
make check-rust
passes locallyclang-format
redefined multiple times
Error #2436