Skip to content

Commit

Permalink
Switch to 2021 edition
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed Jan 29, 2023
1 parent 46d38c0 commit 28d6d25
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.42.0"
msrv = "1.56.0"
11 changes: 0 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,6 @@ jobs:
toolchain: ${{matrix.rust}}
- run: cargo test

msrv:
name: Rust 1.42.0
needs: pre_ci
if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.42.0
- run: cargo check

minimal:
name: Minimal versions
needs: pre_ci
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["rust-patterns", "text-processing", "no-std"]
description = "Indented document literals"
documentation = "https://docs.rs/indoc"
edition = "2018"
edition = "2021"
keywords = ["heredoc", "nowdoc", "multiline", "string", "literal"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/indoc"
rust-version = "1.42"
rust-version = "1.56"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ time so the leftmost non-space character is in the first column.
indoc = "1.0"
```

*Compiler requirement: rustc 1.42 or greater.*
*Compiler requirement: rustc 1.56 or greater.*

<br>

Expand Down
1 change: 0 additions & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
use std::iter::FromIterator;

pub type Result<T> = std::result::Result<T, Error>;

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ use crate::error::{Error, Result};
use crate::unindent::do_unindent;
use proc_macro::token_stream::IntoIter as TokenIter;
use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
use std::iter::{self, FromIterator, Peekable};
use std::iter::{self, Peekable};
use std::str::FromStr;

#[derive(Copy, Clone, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion unindent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["text-processing"]
description = "Remove a column of leading whitespace from a string"
documentation = "https://docs.rs/unindent"
edition = "2018"
edition = "2021"
keywords = ["heredoc", "nowdoc", "multiline", "string", "literal"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/indoc"
Expand Down

0 comments on commit 28d6d25

Please sign in to comment.