Skip to content
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

Fix ancient defect and dependency complications related to having two rust-mode implementations #534

Merged
merged 2 commits into from Mar 29, 2024

Commits on Mar 16, 2024

  1. rust--format-call: Delete file in case of error

    That was always the intention, but the cleanup code was always
    placed outside the unwind forms.
    
      lib/rust-mode/rust-rustfmt.el:60:12: Warning: ‘unwind-protect’
        without unwind forms
    tarsius committed Mar 16, 2024
    Copy the full SHA
    1ce4f8e View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Fix dependencies between rust-mode implementations

    "rust-prog-mode.el" and "rust-mode-treesitter.el" provide competing
    implementations of `rust-mode'.  Both implementations depend on code
    in "rust-mode.el", and thus must require that.
    
    Doing that is complicated by the fact that "rust-mode.el" loads one
    of these libraries, depending on `rust-mode-treesitter-derive's value.
    
    Address this conflict by:
    
    1. Requiring feature `rust-mode' in the two libraries that implement the
       `rust-mode' major-mode and that use things defined in "rust-mode.el".
    
    2. Moving the require forms for these two libraries in "rust-mode.el",
       below the `provide' form for `rust-mode'.
    tarsius committed Mar 27, 2024
    Copy the full SHA
    7c5de03 View commit details
    Browse the repository at this point in the history