Skip to content

Commit a4151db

Browse files
committed
Bump MSRV to 1.82
It is required by newest version of rustyline.
1 parent a4f1a47 commit a4151db

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
CARGO_TERM_COLOR: always
1414
RUSTFLAGS: -Dwarnings
1515
RUST_BACKTRACE: full
16-
rust_min: 1.81.0 # <- Update this when bumping up MSRV
16+
rust_min: 1.82.0 # <- Update this when bumping up MSRV
1717

1818
jobs:
1919
static_checks:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ features will only be developed for the latest major version.
8686

8787
## Supported Rust Versions
8888

89-
Our driver's minimum supported Rust version (MSRV) is 1.81.0.
89+
Our driver's minimum supported Rust version (MSRV) is 1.82.0.
9090
Changes to MSRV can only happen in major and minor relases, but not in patch releases.
9191
We will not bump MSRV to a Rust version that was released less than 6 months ago.
9292

scylla/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "scylla"
33
version = "1.2.0"
44
edition = "2021"
5-
rust-version = "1.81"
5+
rust-version = "1.82"
66
description = "Async CQL driver for Rust, optimized for Scylla, fully compatible with Apache Cassandra™"
77
repository = "https://github.com/scylladb/scylla-rust-driver"
88
readme = "../README.md"

scylla/benches/benchmark.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn calculate_token_bench(c: &mut Criterion) {
5454
.unwrap();
5555
serialized_simple_pk_long_column
5656
.add_value(
57-
&String::from_iter(std::iter::repeat('.').take(2000)),
57+
&String::from_iter(std::iter::repeat_n('.', 2000)),
5858
&ColumnType::Native(NativeType::Text),
5959
)
6060
.unwrap();
@@ -79,7 +79,7 @@ fn calculate_token_bench(c: &mut Criterion) {
7979
.unwrap();
8080
serialized_values_long_column
8181
.add_value(
82-
&String::from_iter(std::iter::repeat('.').take(2000)),
82+
&String::from_iter(std::iter::repeat_n('.', 2000)),
8383
&ColumnType::Native(NativeType::Text),
8484
)
8585
.unwrap();

scylla/src/cluster/metadata.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ impl MetadataReader {
640640
self.known_peers = metadata
641641
.peers
642642
.iter()
643-
.filter(|peer| host_filter.map_or(true, |f| f.accept(peer)))
643+
.filter(|peer| host_filter.is_none_or(|f| f.accept(peer)))
644644
.map(|peer| UntranslatedEndpoint::Peer(peer.to_peer_endpoint()))
645645
.collect();
646646

@@ -664,12 +664,12 @@ impl MetadataReader {
664664
.iter()
665665
.find(|peer| matches!(self.control_connection_endpoint, UntranslatedEndpoint::Peer(PeerEndpoint{address, ..}) if address == peer.address));
666666
if let Some(peer) = control_connection_peer {
667-
if !self.host_filter.as_ref().map_or(true, |f| f.accept(peer)) {
667+
if !self.host_filter.as_ref().is_none_or(|f| f.accept(peer)) {
668668
warn!(
669669
filtered_node_ips = tracing::field::display(metadata
670670
.peers
671671
.iter()
672-
.filter(|peer| self.host_filter.as_ref().map_or(true, |p| p.accept(peer)))
672+
.filter(|peer| self.host_filter.as_ref().is_none_or(|p| p.accept(peer)))
673673
.map(|peer| peer.address)
674674
.format(", ")
675675
),

scylla/src/cluster/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl ClusterState {
116116
}
117117
}
118118
_ => {
119-
let is_enabled = host_filter.map_or(true, |f| f.accept(&peer));
119+
let is_enabled = host_filter.is_none_or(|f| f.accept(&peer));
120120
let (peer_endpoint, tokens) = peer.into_peer_endpoint_and_tokens();
121121
peer_tokens = tokens;
122122
Arc::new(Node::new(

scylla/tests/integration/types/cql_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ async fn test_blob() {
14381438

14391439
let long_blob: Vec<u8> = vec![0x11; 1234];
14401440
let mut long_blob_str: String = "0x".to_string();
1441-
long_blob_str.extend(std::iter::repeat('1').take(2 * 1234));
1441+
long_blob_str.extend(std::iter::repeat_n('1', 2 * 1234));
14421442

14431443
let tests = [
14441444
("0x", vec![]),

0 commit comments

Comments
 (0)