Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/rustfmt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rust-lang/rustfmt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: rustfmt-1.4.37
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 19, 2021

  1. ci: fix release asset upload job

    @calebcartwright
    calebcartwright committed Oct 19, 2021
    Copy the full SHA
    6c1776b View commit details

  2. chore: bump version and changelog

    @calebcartwright
    calebcartwright committed Oct 19, 2021
    Copy the full SHA
    5292bc5 View commit details
Showing with 27 additions and 11 deletions.
  1. +9 −9 .github/workflows/upload-assets.yml
  2. +16 −0 CHANGELOG.md
  3. +1 −1 Cargo.lock
  4. +1 −1 Cargo.toml
18 changes: 9 additions & 9 deletions .github/workflows/upload-assets.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: upload

on:
push:
workflow_dispatch:
release:
types: [created]

@@ -32,24 +34,21 @@ jobs:
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
override: false

- name: Add mingw64 to path for x86_64-gnu
run: echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
if: matrix.rust == 'nightly-x86_64-gnu'
shell: bash

- name: Install cargo-make
uses: actions-rs/cargo@v1
with:
command: install
args: --force cargo-make

- name: Build release binaries
uses: actions-rs/cargo@v1
with:
command: make
args: release
command: build
args: --release
env:
CFG_RELEASE: nightly
CFG_RELEASE_CHANNEL: nightly

- name: Build archive
shell: bash
@@ -70,6 +69,7 @@ jobs:
fi
- name: Upload Release Asset
if: github.event_name == 'release'
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,22 @@

## [Unreleased]

## [1.4.37] 2021-04-03

### Changed

- `rustc-ap-*` crates updated to v712.0.0

### Fixed
- Resolve idempotence issue related to indentation of macro defs that contain or-patterns with inner comments ([#4603](https://github.com/rust-lang/rustfmt/issues/4603))
- Addressed various clippy and rustc warnings

### Install/Download Options
- **crates.io package** - *pending*
- **rustup (nightly)** - *pending*
- **GitHub Release Binaries** - [Release v1.4.37](https://github.com/rust-lang/rustfmt/releases/tag/v1.4.37)
- **Build from source** - [Tag v1.4.37](https://github.com/rust-lang/rustfmt/tree/v1.4.37), see instructions for how to [install rustfmt from source][install-from-source]

## [1.4.36] 2021-02-07

### Changed
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "rustfmt-nightly"
version = "1.4.36"
version = "1.4.37"
authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
description = "Tool to find and fix Rust formatting issues"
repository = "https://github.com/rust-lang/rustfmt"