Skip to content

Commit

Permalink
Merge pull request #195 from qryxip/bump-ra
Browse files Browse the repository at this point in the history
Switch to RA `2023-07-31`
  • Loading branch information
qryxip authored Aug 5, 2023
2 parents a6fb6a7 + 342a429 commit fdf40b8
Show file tree
Hide file tree
Showing 13 changed files with 641 additions and 794 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
- 'v[0-9]+.[0-9]+.[0-9]+**'
pull_request:

env:
CARGO_EQUIP_TEST_NIGHTLY_TOOLCHAIN: nightly-2023-08-04

jobs:
rustfmt:
name: Rustfmt
Expand All @@ -32,8 +35,6 @@ jobs:
grcov:
name: grcov
runs-on: ubuntu-20.04
env:
CARGO_EQUIP_TEST_NIGHTLY_TOOLCHAIN: nightly-2022-03-25
if: ${{ github.repository_owner == 'qryxip' && github.ref == 'refs/heads/master' }}

steps:
Expand Down Expand Up @@ -102,9 +103,6 @@ jobs:
name: ${{ matrix.channel }}-${{ matrix.target-triple }}
runs-on: ${{ matrix.os }}

env:
CARGO_EQUIP_TEST_NIGHTLY_TOOLCHAIN: nightly-2022-03-25

steps:
- name: Disable `core.autocrlf`
run: git config --global core.autocrlf false
Expand Down
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# Changelog

## [Unreleased]

### Added

- Added `--toolchain-for-proc-macro-srv`.

```console
--toolchain-for-proc-macro-srv <TOOLCHAIN> Toolchain for expanding procedural macros
```

### Changed

- Updated the embedded Rust Analyzer to `2023-07-31` (`0.0.166`).

For Rust <1.64, `--toolchain-for-proc-macro-srv` is required for macro expansion.

```console
❯ cargo +1.42.0 equip 2>&1 | tail -n 2
Rust ≧1.64.0 is required for expanding procedural macros. Specify one with `--toolchain-for-proc-macro-srv`
```

This update should fix the issue where macro expansion segfaults.

- `--toolchain` was renamed to `--toolchain-for-udeps`.

```console
❯ cargo equip --toolchain nightly
warning: `--toolchain` was renamed to `--toolchain-for-udeps`
```

### Fixed

- Updated [prettytable](https://docs.rs/crate/prettytable). ([#193](https://github.com/qryxip/cargo-equip/pull/193) by [@ichyo](https://github.com/ichyo))

Now cargo-equip built with recent Rust works.

## [0.19.0] - 2022-03-26Z

### Added
Expand Down
Loading

0 comments on commit fdf40b8

Please sign in to comment.