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

Get rid of atty dependency and bump MSRV to 1.70 #220

Merged
merged 2 commits into from
Jan 17, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.64"
toolchain: "1.70"
profile: minimal
override: true
- name: Run check
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- \[Rust\]: Added `#[allow(dead_code)]` to the root of the generated rust code [#204](https://github.com/planus-org/planus/pull/204)
- Added the option `ignore_docstring_errors` to the app. [#216](https://github.com/planus-org/planus/pull/216)
- Get rid of dependency on `atty` and bump the Minimum Support Rust Version (MSRV) to 1.70.0. [#220](https://github.com/planus-org/planus/pull/220)

### Fixed

Expand Down
23 changes: 1 addition & 22 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ resolver = "2"
version = "0.4.0"
license = "MIT/Apache-2.0"
repository = "https://github.com/planus-org/planus"
rust-version = "1.64"
rust-version = "1.70"
edition = "2021"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Planus – alternative flatbuffer implementation

[![Build Status](https://github.com/planus-org/planus/actions/workflows/rust.yml/badge.svg?branch=main)](https://github.com/planus-org/planus/actions/workflows/rust.yml)
![Rustc Version 1.64+](https://img.shields.io/badge/rustc-1.64+-lightgray.svg)
![Rustc Version 1.70+](https://img.shields.io/badge/rustc-1.70+-lightgray.svg)
[![License](https://img.shields.io/crates/l/planus)](https://crates.io/crates/planus)
[![Crates.io](https://img.shields.io/crates/v/planus)](https://crates.io/crates/planus)
[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/planus)
Expand Down Expand Up @@ -99,7 +99,7 @@ Things we will probably never support:

## Minimum Supported Rust Version (MSRV)

Our current Minimum Supported Rust Version is 1.64.0. When adding features, we will follow these guidelines:
Our current Minimum Supported Rust Version is 1.70.0. When adding features, we will follow these guidelines:

- We will aim to support the latest five minor Rust versions. This gives you a 6 month window to upgrade your compiler.
- Any change to the MSRV will be accompanied with a minor version bump
Expand Down
1 change: 0 additions & 1 deletion crates/planus-translation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ description = "Internal translation library for planus."
[dependencies]
planus-lexer = { version = "0.4.0", path = "../planus-lexer" }
planus-types = { version = "0.4.0", path = "../planus-types" }
atty = "0.2.14"
bitflags = "2.3.1"
codespan = "0.11.1"
codespan-reporting = "0.11.1"
Expand Down
3 changes: 2 additions & 1 deletion crates/planus-translation/src/ctx.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{
cell::{Cell, RefCell},
io::IsTerminal,
path::{Path, PathBuf},
sync::RwLock,
};
Expand Down Expand Up @@ -37,7 +38,7 @@ pub struct Ctx {

impl Default for Ctx {
fn default() -> Self {
let color_choice = if atty::is(atty::Stream::Stderr) {
let color_choice = if std::io::stderr().is_terminal() {
ColorChoice::Auto
} else {
ColorChoice::Never
Expand Down
Loading