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

Remove version downgrades, bump msrv to 1.46.0 #355

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
rust: [1.36.0, stable, nightly]
rust: [1.46.0, stable, nightly]

steps:
- uses: actions/checkout@v2
Expand All @@ -25,18 +25,6 @@ jobs:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
- uses: actions-rs/cargo@v1
name: Downgrade bitflags to MSRV
if: ${{ matrix.rust }} == "1.36.0"
with:
command: update
args: -p bitflags --precise 1.2.1
- uses: actions-rs/cargo@v1
name: Downgrade indexmap to MSRV
if: ${{ matrix.rust }} == "1.36.0"
with:
command: update
args: -p indexmap --precise 1.6.2
- run: cargo test
- run: cargo test --features integer128
- run: cargo test --features indexmap
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add `integer128` feature that guards `i128` and `u128` ([#304](https://github.com/ron-rs/ron/pull/304), [#351](https://github.com/ron-rs/ron/pull/351))
- Fix issue [#265](https://github.com/ron-rs/ron/issues/265) with better missing comma error ([#353](https://github.com/ron-rs/ron/pull/353))
- Fix issue [#301](https://github.com/ron-rs/ron/issues/301) with better error messages ([#354](https://github.com/ron-rs/ron/pull/354))
- Bump MSRV to 1.46.0

## [0.7.0] - 2021-10-22

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ integer128 = []

[dependencies]
base64 = "0.13"
bitflags = "=1.2.1"
bitflags = "1.0.4"
juntyr marked this conversation as resolved.
Show resolved Hide resolved
indexmap = { version = "1.0.2", features = ["serde-1"], optional = true }
serde = { version = "1.0.60", features = ["serde_derive"] }

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![CI](https://github.com/ron-rs/ron/actions/workflows/ci.yaml/badge.svg)](https://github.com/ron-rs/ron/actions/workflows/ci.yaml)
[![Crates.io](https://img.shields.io/crates/v/ron.svg)](https://crates.io/crates/ron)
[![MSRV](https://img.shields.io/badge/MSRV-1.36.0-orange)](https://github.com/ron-rs/ron)
[![MSRV](https://img.shields.io/badge/MSRV-1.46.0-orange)](https://github.com/ron-rs/ron)
[![Docs](https://docs.rs/ron/badge.svg)](https://docs.rs/ron)
[![Matrix](https://img.shields.io/matrix/ron-rs:matrix.org.svg)](https://matrix.to/#/#ron-rs:matrix.org)

Expand Down Expand Up @@ -146,7 +146,7 @@ fn main() {
## Tooling

| Editor | Plugin |
|--------------|-------------------------------------------------------------|
| ------------ | ----------------------------------------------------------- |
| IntelliJ | [intellij-ron](https://github.com/ron-rs/intellij-ron) |
| VS Code | [a5huynh/vscode-ron](https://github.com/a5huynh/vscode-ron) |
| Sublime Text | [RON](https://packagecontrol.io/packages/RON) |
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.36"
msrv = "1.46.0"
blacklisted-names = []
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

2 changes: 2 additions & 0 deletions tests/256_comma_error.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(dead_code)]

use ron::error::{Error, ErrorCode, Position};

#[derive(Debug, serde::Deserialize)]
Expand Down