Skip to content

Conversation

@yyc12345
Copy link
Contributor

@yyc12345 yyc12345 commented May 16, 2025

  • rename the error type in each subcommand module to a simple CmdError, as there are no naming conflicts, keeping the name simple.
  • rename error type and their field names to "verb + noun" style, instead of "noun + verb" format.
  • remove useless Error suffix from the members of the error type.

Summary by Sourcery

Refactor error types and related names across the codebase to follow Rust naming conventions by adopting concise, verb-noun style identifiers and removing redundant “Error” suffixes.

Enhancements:

  • Rename error enums for loading configuration and YAML (TxConfigLoadError → LoadTxConfigError, TxYamlLoadError → LoadTxYamlError).
  • Adjust error variant names to verb+noun style (e.g. ParseError → ParseFile, LoadPoError → LoadPoFile, UreqError → Ureq).
  • Update function signatures and return types across transifex modules, subcommands, REST API, and CLI to use the new error types.
  • Merge subcommand-specific error enums (CmdTC2YError, CmdY2TCError) into a single CmdError type.

@deepin-ci-robot
Copy link

Hi @yyc12345. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented May 16, 2025

Reviewer's Guide

This PR refactors error types and related identifiers across the codebase to conform with Rust naming conventions—renaming enums, variants, and subcommand error types, and updating all affected function signatures, imports, and error mappings in one pass.

File-Level Changes

Change Details Files
Normalize error enum names across modules
  • Rename TxConfigLoadError to LoadTxConfigError
  • Rename TxYamlLoadError to LoadTxYamlError
  • Unify subcommand error enums to a generic CmdError
  • Update CLI error variants to reference the new enum names
src/transifex/tx_config_file.rs
src/transifex/yaml_file.rs
src/subcmd/txconfig2yaml.rs
src/subcmd/yaml2txconfig.rs
src/cli.rs
Rename error variants to verb+noun style and drop Error suffix
  • ParseErrorParseFile
  • ConvertErrorConvertFile
  • SaveTransifexYamlErrorSaveTransifexYaml
  • UreqErrorUreq, SerdeErrorSerde
  • LoadPoErrorLoadPoFile
src/transifex/tx_config_file.rs
src/transifex/yaml_file.rs
src/transifex/rest_api.rs
src/subcmd/statistics.rs
src/subcmd/txconfig2yaml.rs
src/subcmd/yaml2txconfig.rs
Update function signatures, imports, and error mappings
  • Adjust all Result<…, OldError> to use renamed enums
  • Update #[from] derives and use statements to new types
  • Revise map_err, Err(...) and error construction sites to match the new variant names
src/transifex/tx_config_file.rs
src/transifex/yaml_file.rs
src/transifex/rest_api.rs
src/subcmd/statistics.rs
src/subcmd/txconfig2yaml.rs
src/subcmd/yaml2txconfig.rs

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @yyc12345 - I've reviewed your changes - here's some feedback:

  • There’s a typo in function names like try_laod_tx_config_file — it should be try_load_* for consistency.
  • Consider giving each subcommand its own error enum name instead of reusing a generic CmdError to improve clarity and avoid import ambiguity.
Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

}

pub fn try_laod_tx_config_file(project_root: &PathBuf) -> Result<(PathBuf, TxConfig), TxConfigLoadError> {
pub fn try_laod_tx_config_file(project_root: &PathBuf) -> Result<(PathBuf, TxConfig), LoadTxConfigError> {
Copy link

Choose a reason for hiding this comment

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

suggestion (typo): Typo in function name: "laod" → "load"

Rename the function to try_load_tx_config_file.

Suggested implementation:

pub fn try_load_tx_config_file(project_root: &PathBuf) -> Result<(PathBuf, TxConfig), LoadTxConfigError> {

• Search for all occurrences of try_laod_tx_config_file (in tests, other modules, etc.) and rename them to try_load_tx_config_file.


let mut tx_section = TransifexRcSection::default();

let sections = config.sections();
Copy link

Choose a reason for hiding this comment

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

issue: No error if INI has zero sections

Since from_str returns a default struct with empty fields when sections() is empty, return an error to avoid silent misconfiguration.

…tions.

- rename the error type in each subcommand module to a simple `CmdError`, as there are no naming conflicts, keeping the name simple.
- rename error type and their field names to "verb + noun" style, instead of "noun + verb" format.
- remove useless `Error` suffix from the members of the error type.
- fix `laod` typo.
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, yyc12345

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@BLumia BLumia merged commit aa17883 into linuxdeepin:master May 20, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants