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

Bump thread_local pin and minimum rust version #231

Merged
merged 2 commits into from Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Expand Up @@ -18,14 +18,14 @@ jobs:
run: make test

test-stable:
name: Test on 1.46.0
name: Test on 1.56.1
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.46.0
toolchain: 1.56.1
profile: minimal
override: true
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
description = "A snapshot testing library for Rust"
edition = "2018"
rust-version = "1.46"
rust-version = "1.56.1"
homepage = "https://insta.rs/"
repository = "https://github.com/mitsuhiko/insta"
keywords = ["snapshot", "testing", "jest", "approval"]
Expand Down
13 changes: 0 additions & 13 deletions Makefile
Expand Up @@ -8,8 +8,6 @@ doc:

test: cargotest cargo-insta-tests

test-legacy: cargotest-legacy

cargo-insta-tests:
@echo "CARGO-INSTA INTEGRATION TESTS"
@cd cargo-insta/integration-tests; cargo run
Expand All @@ -23,17 +21,6 @@ cargotest:
@cargo test --features redactions,backtrace -- --test-threads 1
@cd cargo-insta; cargo test

cargotest-legacy:
# This can't run the tests against backtrace as this feature no longer works
# on older rust
@echo "CARGO TESTS LEGACY"
@rustup component add rustfmt 2> /dev/null
@cargo test
@cargo test --features redactions,glob
@cargo test --features redactions
@cargo test --no-default-features
@cd cargo-insta; cargo test

format:
@rustup component add rustfmt 2> /dev/null
@cargo fmt --all
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -6,7 +6,7 @@
[![Build Status](https://github.com/mitsuhiko/insta/workflows/Tests/badge.svg?branch=master)](https://github.com/mitsuhiko/insta/actions?query=workflow%3ATests)
[![Crates.io](https://img.shields.io/crates/d/insta.svg)](https://crates.io/crates/insta)
[![License](https://img.shields.io/github/license/mitsuhiko/insta)](https://github.com/mitsuhiko/insta/blob/master/LICENSE)
[![rustc 1.46.0](https://img.shields.io/badge/rust-1.46%2B-orange.svg)](https://img.shields.io/badge/rust-1.46%2B-orange.svg)
[![rustc 1.56.1](https://img.shields.io/badge/rust-1.56.1%2B-orange.svg)](https://img.shields.io/badge/rust-1.56.1%2B-orange.svg)
[![Documentation](https://docs.rs/insta/badge.svg)](https://docs.rs/insta)
[![VSCode Extension](https://img.shields.io/visual-studio-marketplace/v/mitsuhiko.insta?label=vscode%20extension)](https://marketplace.visualstudio.com/items?itemName=mitsuhiko.insta)

Expand Down
4 changes: 2 additions & 2 deletions cargo-insta/Cargo.lock

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