Skip to content

Commit 6e5aa43

Browse files
ia0ia0
authored
Bump MSRV (ia0#77)
The bump is needed because of proc-macro2. Also disable lang_items lint for nostd test.
1 parent 48fefec commit 6e5aa43

File tree

8 files changed

+65
-58
lines changed

8 files changed

+65
-58
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -206,36 +206,36 @@ jobs:
206206
- name: cd lib/macro && cargo +stable semver-checks check-release
207207
run: cargo +stable semver-checks check-release
208208
working-directory: lib/macro
209-
- run: rustup install 1.47
210-
- name: cd lib && cargo +1.47 build
211-
run: cargo +1.47 build
209+
- run: rustup install 1.70
210+
- name: cd lib && cargo +1.70 build
211+
run: cargo +1.70 build
212212
working-directory: lib
213-
- name: cd lib && cargo +1.47 build --release
214-
run: cargo +1.47 build --release
213+
- name: cd lib && cargo +1.70 build --release
214+
run: cargo +1.70 build --release
215215
working-directory: lib
216-
- name: cd lib && cargo +1.47 build --no-default-features --features=alloc
217-
run: cargo +1.47 build --no-default-features --features=alloc
216+
- name: cd lib && cargo +1.70 build --no-default-features --features=alloc
217+
run: cargo +1.70 build --no-default-features --features=alloc
218218
working-directory: lib
219-
- name: cd lib && cargo +1.47 build --release --no-default-features --features=alloc
220-
run: cargo +1.47 build --release --no-default-features --features=alloc
219+
- name: cd lib && cargo +1.70 build --release --no-default-features --features=alloc
220+
run: cargo +1.70 build --release --no-default-features --features=alloc
221221
working-directory: lib
222-
- name: cd lib && cargo +1.47 build --no-default-features
223-
run: cargo +1.47 build --no-default-features
222+
- name: cd lib && cargo +1.70 build --no-default-features
223+
run: cargo +1.70 build --no-default-features
224224
working-directory: lib
225-
- name: cd lib && cargo +1.47 build --release --no-default-features
226-
run: cargo +1.47 build --release --no-default-features
225+
- name: cd lib && cargo +1.70 build --release --no-default-features
226+
run: cargo +1.70 build --release --no-default-features
227227
working-directory: lib
228-
- name: cd lib/macro/internal && cargo +1.47 build
229-
run: cargo +1.47 build
228+
- name: cd lib/macro/internal && cargo +1.70 build
229+
run: cargo +1.70 build
230230
working-directory: lib/macro/internal
231-
- name: cd lib/macro/internal && cargo +1.47 build --release
232-
run: cargo +1.47 build --release
231+
- name: cd lib/macro/internal && cargo +1.70 build --release
232+
run: cargo +1.70 build --release
233233
working-directory: lib/macro/internal
234-
- name: cd lib/macro && cargo +1.47 build
235-
run: cargo +1.47 build
234+
- name: cd lib/macro && cargo +1.70 build
235+
run: cargo +1.70 build
236236
working-directory: lib/macro
237-
- name: cd lib/macro && cargo +1.47 build --release
238-
run: cargo +1.47 build --release
237+
- name: cd lib/macro && cargo +1.70 build --release
238+
run: cargo +1.70 build --release
239239
working-directory: lib/macro
240240
windows:
241241
runs-on: windows-latest
@@ -315,34 +315,34 @@ jobs:
315315
- name: cd bin && cargo +stable build --release
316316
run: cargo +stable build --release
317317
working-directory: bin
318-
- run: rustup install 1.47
319-
- name: cd lib && cargo +1.47 build
320-
run: cargo +1.47 build
318+
- run: rustup install 1.70
319+
- name: cd lib && cargo +1.70 build
320+
run: cargo +1.70 build
321321
working-directory: lib
322-
- name: cd lib && cargo +1.47 build --release
323-
run: cargo +1.47 build --release
322+
- name: cd lib && cargo +1.70 build --release
323+
run: cargo +1.70 build --release
324324
working-directory: lib
325-
- name: cd lib && cargo +1.47 build --no-default-features --features=alloc
326-
run: cargo +1.47 build --no-default-features --features=alloc
325+
- name: cd lib && cargo +1.70 build --no-default-features --features=alloc
326+
run: cargo +1.70 build --no-default-features --features=alloc
327327
working-directory: lib
328-
- name: cd lib && cargo +1.47 build --release --no-default-features --features=alloc
329-
run: cargo +1.47 build --release --no-default-features --features=alloc
328+
- name: cd lib && cargo +1.70 build --release --no-default-features --features=alloc
329+
run: cargo +1.70 build --release --no-default-features --features=alloc
330330
working-directory: lib
331-
- name: cd lib && cargo +1.47 build --no-default-features
332-
run: cargo +1.47 build --no-default-features
331+
- name: cd lib && cargo +1.70 build --no-default-features
332+
run: cargo +1.70 build --no-default-features
333333
working-directory: lib
334-
- name: cd lib && cargo +1.47 build --release --no-default-features
335-
run: cargo +1.47 build --release --no-default-features
334+
- name: cd lib && cargo +1.70 build --release --no-default-features
335+
run: cargo +1.70 build --release --no-default-features
336336
working-directory: lib
337-
- name: cd lib/macro/internal && cargo +1.47 build
338-
run: cargo +1.47 build
337+
- name: cd lib/macro/internal && cargo +1.70 build
338+
run: cargo +1.70 build
339339
working-directory: lib/macro/internal
340-
- name: cd lib/macro/internal && cargo +1.47 build --release
341-
run: cargo +1.47 build --release
340+
- name: cd lib/macro/internal && cargo +1.70 build --release
341+
run: cargo +1.70 build --release
342342
working-directory: lib/macro/internal
343-
- name: cd lib/macro && cargo +1.47 build
344-
run: cargo +1.47 build
343+
- name: cd lib/macro && cargo +1.70 build
344+
run: cargo +1.70 build
345345
working-directory: lib/macro
346-
- name: cd lib/macro && cargo +1.47 build --release
347-
run: cargo +1.47 build --release
346+
- name: cd lib/macro && cargo +1.70 build --release
347+
run: cargo +1.70 build --release
348348
working-directory: lib/macro

‎bin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ name = "data-encoding"
1616
path = "src/main.rs"
1717

1818
[dependencies]
19-
data-encoding = { version = "2.4.1-git", path = "../lib" }
19+
data-encoding = { version = "2.5.0-git", path = "../lib" }
2020
getopts = "0.2"

‎lib/CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

3-
## 2.4.1-git
3+
## 2.5.0-git
4+
5+
### Minor
6+
7+
- Bump MSRV from 1.47 to 1.70
48

59
### Patch
610

‎lib/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
22
name = "data-encoding"
3-
version = "2.4.1-git"
3+
version = "2.5.0-git"
44
authors = ["Julien Cretin <git@ia0.eu>"]
55
license = "MIT"
66
edition = "2018"
7-
rust-version = "1.47"
7+
rust-version = "1.70"
88
keywords = ["no_std", "base64", "base32", "hex"]
99
categories = ["encoding", "no-std"]
1010
readme = "README.md"

‎lib/macro/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.14-git"
44
authors = ["Julien Cretin <cretin@google.com>"]
55
license = "MIT"
66
edition = "2018"
7-
rust-version = "1.47"
7+
rust-version = "1.70"
88
keywords = ["no_std", "base64", "base32", "hex", "macro"]
99
categories = ["encoding", "no-std"]
1010
readme = "README.md"
@@ -14,5 +14,5 @@ description = "Macros for data-encoding"
1414
include = ["Cargo.toml", "LICENSE", "README.md", "src/lib.rs"]
1515

1616
[dependencies]
17-
data-encoding = { version = "2.4.1-git", path = "..", default-features = false }
17+
data-encoding = { version = "2.5.0-git", path = "..", default-features = false }
1818
data-encoding-macro-internal = { version = "0.1.12-git", path = "internal" }

‎lib/macro/internal/Cargo.toml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.12-git"
44
authors = ["Julien Cretin <cretin@google.com>"]
55
license = "MIT"
66
edition = "2018"
7-
rust-version = "1.47"
7+
rust-version = "1.70"
88
description = "Internal library for data-encoding-macro"
99
readme = "README.md"
1010
repository = "https://github.com/ia0/data-encoding"
@@ -13,11 +13,13 @@ include = ["Cargo.toml", "LICENSE", "README.md", "src/lib.rs"]
1313
[lib]
1414
proc-macro = true
1515

16-
[dependencies]
17-
data-encoding = { version = "2.4.1-git", path = "../..", default-features = false, features = [
18-
"alloc",
19-
] }
20-
syn = { version = "1", default-features = false, features = [
21-
"parsing",
22-
"proc-macro",
23-
] }
16+
[dependencies.data-encoding]
17+
version = "2.5.0-git"
18+
path = "../.."
19+
default-features = false
20+
features = ["alloc"]
21+
22+
[dependencies.syn]
23+
version = "1"
24+
default-features = false
25+
features = ["parsing", "proc-macro"]

‎nostd/src/main.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#![no_std]
22
#![no_main]
3+
#![allow(internal_features)]
34
#![feature(lang_items)]
45

56
use core::fmt::Write;

‎xtask/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enum Toolchain {
3232
#[strum(serialize = "stable")]
3333
Stable,
3434

35-
#[strum(serialize = "1.47")]
35+
#[strum(serialize = "1.70")]
3636
Msrv,
3737
}
3838

0 commit comments

Comments
 (0)