Skip to content

Commit 090dfe2

Browse files
authored
Merge pull request #226 from kristof-mattei/rand-010
fix: update rand to 0.10.0
2 parents a96cb6c + 2726713 commit 090dfe2

6 files changed

Lines changed: 15 additions & 11 deletions

File tree

.github/workflows/linters.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
pull_request:
88
branches:
99
- "*"
10+
env:
11+
MINIMUM_SUPPORTED_TOOLCHAIN: 1.85.0
1012

1113
jobs:
1214
rustfmt:
@@ -16,12 +18,13 @@ jobs:
1618
- uses: actions/checkout@v1
1719
- uses: actions-rs/toolchain@v1
1820
with:
19-
toolchain: 1.70.0
21+
toolchain: ${{ env.MINIMUM_SUPPORTED_TOOLCHAIN }}
2022
profile: minimal
2123
components: clippy, rustfmt
2224
override: true
2325
- name: Run rustfmt
2426
run: cargo fmt -- --check
27+
2528
clippy:
2629
name: Run clippy on the minimum supported toolchain
2730
runs-on: ubuntu-latest
@@ -38,7 +41,7 @@ jobs:
3841
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
3942
- uses: actions-rs/toolchain@v1
4043
with:
41-
toolchain: 1.70.0
44+
toolchain: ${{ env.MINIMUM_SUPPORTED_TOOLCHAIN }}
4245
profile: minimal
4346
components: clippy, rustfmt
4447
override: true

.github/workflows/tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
pull_request:
88
branches:
99
- "*"
10+
env:
11+
MINIMUM_SUPPORTED_TOOLCHAIN: 1.85.0
1012

1113
jobs:
1214
test-default:
@@ -25,7 +27,7 @@ jobs:
2527
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS: fallback
2628
- uses: actions-rs/toolchain@v1
2729
with:
28-
toolchain: 1.70.0
30+
toolchain: ${{ env.MINIMUM_SUPPORTED_TOOLCHAIN }}
2931
profile: minimal
3032
override: true
3133
- name: Check

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ hyper = "1"
2929
hyper-util = { version = "0.1", features = ["server-auto", "tokio"] }
3030
log = "0.4"
3131
pin-project-lite = "0.2"
32-
rand = "0.9"
32+
rand = "0.10"
3333
regex = "1.7"
3434
serde_json = "1.0"
3535
serde_urlencoded = "0.7"

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<p align="center">
44
<a href="https://docs.rs/mockito"><img src="https://docs.rs/mockito/badge.svg"></a>
55
<a href="https://crates.io/crates/mockito"><img src="https://img.shields.io/crates/v/mockito.svg"></a>
6-
<img src="https://img.shields.io/badge/rust%20version-%3E%3D1.70.0-orange">
6+
<img src="https://img.shields.io/badge/rust%20version-%3E%3D1.85.0-orange">
77
<a href="https://crates.io/crates/mockito"><img src="https://img.shields.io/crates/d/mockito"></a>
88
<a href="https://github.com/lipanski/mockito/actions/workflows/tests.yml/?branch=master"><img src="https://github.com/lipanski/mockito/actions/workflows/tests.yml/badge.svg?branch=master"></a>
99
</p>
1010
<p align="center"><em>HTTP mocking for Rust!</em></p>
1111
</p>
1212

13-
Mockito is a library for **generating and delivering HTTP mocks** in Rust. You can use it for integration testing
13+
Mockito is a library for **generating and delivering HTTP mocks** in Rust. You can use it for integration testing
1414
or offline work. Mockito runs a local pool of HTTP servers which create, deliver and remove the mocks.
1515

1616
## Features
@@ -25,7 +25,6 @@ or offline work. Mockito runs a local pool of HTTP servers which create, deliver
2525
- Simple, intuitive API
2626
- An awesome logo
2727

28-
2928
The full documentation is available at <https://docs.rs/mockito>.
3029

3130
Before upgrading, make sure to check out the [changelog](https://github.com/lipanski/mockito/releases).
@@ -139,7 +138,7 @@ fn main() {
139138

140139
## Minimum supported Rust toolchain
141140

142-
The current minimum support Rust toolchain is **1.70.0**
141+
The current minimum support Rust toolchain is **1.85.0**
143142

144143
## Contribution Guidelines
145144

@@ -161,7 +160,7 @@ cargo test
161160
...or run tests using a different toolchain:
162161

163162
```sh
164-
rustup run --install 1.70.0 cargo test
163+
rustup run --install 1.85.0 cargo test
165164
```
166165

167166
...or run tests while disabling the default features (e.g. the colors):

src/mock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{Error, ErrorKind};
88
use bytes::Bytes;
99
use http::{HeaderMap, HeaderName, StatusCode};
1010
use rand::distr::Alphanumeric;
11-
use rand::Rng;
11+
use rand::RngExt;
1212
use std::fmt;
1313
use std::io;
1414
use std::ops::Drop;

tests/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate serde_json;
33

44
use mockito::{Matcher, Server, ServerOpts};
55
use rand::distr::Alphanumeric;
6-
use rand::Rng;
6+
use rand::RngExt;
77
use std::fmt::Display;
88
use std::fs;
99
use std::io::{BufRead, BufReader, Read, Write};

0 commit comments

Comments
 (0)