Skip to content

Commit cdef942

Browse files
bodilbodil
committed
Bump dependencies, MSRV and edition.
1 parent 04e08ba commit cdef942

File tree

4 files changed

+110
-112
lines changed

4 files changed

+110
-112
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
11
name: Continuous Integration
22
on:
3-
push:
4-
pull_request:
5-
schedule:
6-
- cron: "0 0 1,15 * *"
3+
push:
4+
pull_request:
5+
schedule:
6+
- cron: "0 0 1,15 * *"
77

88
jobs:
9-
check:
10-
name: Check
11-
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
rust:
15-
- stable
16-
- nightly
17-
- 1.46.0 # lowest supported version
18-
flags:
19-
- --all-features
20-
- --no-default-features
21-
steps:
22-
- uses: actions/checkout@v2
23-
- uses: actions-rs/toolchain@v1
24-
with:
25-
profile: minimal
26-
toolchain: ${{ matrix.rust }}
27-
override: true
28-
- uses: actions-rs/cargo@v1
29-
with:
30-
command: check
31-
args: ${{ matrix.flags }}
9+
check:
10+
name: Check
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
rust:
15+
- stable
16+
- nightly
17+
- 1.56.0 # lowest supported version
18+
flags:
19+
- --all-features
20+
- --no-default-features
21+
steps:
22+
- uses: actions/checkout@v2
23+
- uses: actions-rs/toolchain@v1
24+
with:
25+
profile: minimal
26+
toolchain: ${{ matrix.rust }}
27+
override: true
28+
- uses: actions-rs/cargo@v1
29+
with:
30+
command: check
31+
args: ${{ matrix.flags }}
3232

33-
test:
34-
name: Tests
35-
runs-on: ubuntu-latest
36-
strategy:
37-
matrix:
38-
rust:
39-
- stable
40-
- nightly
41-
- 1.46.0 # lowest supported version
42-
steps:
43-
- uses: actions/checkout@v2
44-
- uses: actions-rs/toolchain@v1
45-
with:
46-
profile: minimal
47-
toolchain: ${{ matrix.rust }}
48-
override: true
49-
- uses: actions-rs/cargo@v1
50-
with:
51-
command: test
52-
args: --all-features
33+
test:
34+
name: Tests
35+
runs-on: ubuntu-latest
36+
strategy:
37+
matrix:
38+
rust:
39+
- stable
40+
- nightly
41+
- 1.56.0 # lowest supported version
42+
steps:
43+
- uses: actions/checkout@v2
44+
- uses: actions-rs/toolchain@v1
45+
with:
46+
profile: minimal
47+
toolchain: ${{ matrix.rust }}
48+
override: true
49+
- uses: actions-rs/cargo@v1
50+
with:
51+
command: test
52+
args: --all-features
5353

54-
fmt:
55-
name: Rustfmt
56-
runs-on: ubuntu-latest
57-
steps:
58-
- uses: actions/checkout@v2
59-
- uses: actions-rs/toolchain@v1
60-
with:
61-
profile: minimal
62-
toolchain: stable
63-
override: true
64-
components: rustfmt
65-
- uses: actions-rs/cargo@v1
66-
with:
67-
command: fmt
68-
args: --all -- --check
54+
fmt:
55+
name: Rustfmt
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v2
59+
- uses: actions-rs/toolchain@v1
60+
with:
61+
profile: minimal
62+
toolchain: stable
63+
override: true
64+
components: rustfmt
65+
- uses: actions-rs/cargo@v1
66+
with:
67+
command: fmt
68+
args: --all -- --check
6969

70-
clippy:
71-
name: Clippy
72-
runs-on: ubuntu-latest
73-
strategy:
74-
matrix:
75-
rust:
76-
- stable
77-
- nightly
78-
steps:
79-
- uses: actions/checkout@v2
80-
- uses: actions-rs/toolchain@v1
81-
with:
82-
profile: minimal
83-
toolchain: ${{ matrix.rust }}
84-
override: true
85-
components: clippy
86-
- uses: actions-rs/clippy-check@v1
87-
with:
88-
name: Clippy-${{ matrix.rust }}
89-
token: ${{ secrets.GITHUB_TOKEN }}
90-
args: --all-features
91-
# miri:
92-
# name: Miri
93-
# runs-on: ubuntu-latest
94-
# steps:
95-
# - uses: actions/checkout@v2
96-
# - uses: actions-rs/toolchain@v1
97-
# with:
98-
# profile: minimal
99-
# toolchain: nightly
100-
# override: true
101-
# components: miri
102-
# - name: Run Miri
103-
# run: |
104-
# cargo miri setup
105-
# cargo miri test -- -Zmiri-disable-isolation -- --skip proptest --skip ser_de
70+
clippy:
71+
name: Clippy
72+
runs-on: ubuntu-latest
73+
strategy:
74+
matrix:
75+
rust:
76+
- stable
77+
- nightly
78+
steps:
79+
- uses: actions/checkout@v2
80+
- uses: actions-rs/toolchain@v1
81+
with:
82+
profile: minimal
83+
toolchain: ${{ matrix.rust }}
84+
override: true
85+
components: clippy
86+
- uses: actions-rs/clippy-check@v1
87+
with:
88+
name: Clippy-${{ matrix.rust }}
89+
token: ${{ secrets.GITHUB_TOKEN }}
90+
args: --all-features
91+
# miri:
92+
# name: Miri
93+
# runs-on: ubuntu-latest
94+
# steps:
95+
# - uses: actions/checkout@v2
96+
# - uses: actions-rs/toolchain@v1
97+
# with:
98+
# profile: minimal
99+
# toolchain: nightly
100+
# override: true
101+
# components: miri
102+
# - name: Run Miri
103+
# run: |
104+
# cargo miri setup
105+
# cargo miri test -- -Zmiri-disable-isolation -- --skip proptest --skip ser_de

‎Cargo.toml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "smartstring"
33
version = "0.2.9"
44
authors = ["Bodil Stokke <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MPL-2.0+"
77
description = "Compact inlined strings"
88
repository = "https://github.com/bodil/smartstring"
@@ -11,6 +11,7 @@ readme = "./README.md"
1111
categories = ["data-structures"]
1212
keywords = ["cache-local", "cpu-cache", "small-string", "sso", "inline-string"]
1313
exclude = ["release.toml", "proptest-regressions/**"]
14+
rust-version = "1.56"
1415

1516
[package.metadata.docs.rs]
1617
features = ["arbitrary", "proptest", "serde"]
@@ -28,14 +29,14 @@ std = []
2829
test = ["std", "arbitrary", "arbitrary/derive"]
2930

3031
[dependencies]
31-
static_assertions = "1.1.0"
32+
static_assertions = "1"
3233
serde = { version = "1", optional = true }
33-
arbitrary = { version = "1.1.0", optional = true }
34-
proptest = { version = "0.10", optional = true }
34+
arbitrary = { version = "1", optional = true }
35+
proptest = { version = "1", optional = true }
3536

3637
[dev-dependencies]
37-
proptest = "0.10"
38-
proptest-derive = "0.2"
39-
criterion = "0.3.2"
40-
rand = "0.7.3"
38+
proptest = "1"
39+
proptest-derive = "0.3"
40+
criterion = "0.3"
41+
rand = "0.8"
4142
serde_test = "1"

‎fuzz/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ edition = "2018"
99
cargo-fuzz = true
1010

1111
[dependencies]
12-
libfuzzer-sys = "0.3"
13-
arbitrary = "0.4"
12+
libfuzzer-sys = "0.4"
13+
arbitrary = "1"
1414

1515
[dependencies.smartstring]
1616
path = ".."

‎src/arbitrary.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
use crate::{SmartString, SmartStringMode};
2-
use alloc::{
3-
boxed::Box,
4-
string::{String, ToString},
5-
};
2+
use alloc::string::String;
63
use arbitrary::{Arbitrary, Result, Unstructured};
74

85
impl<'a, Mode: SmartStringMode> Arbitrary<'a> for SmartString<Mode>

0 commit comments

Comments
 (0)