Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rust toolchain to 1.70 #199

Merged
merged 2 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ess/benches/load_bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fn event_sub_system_bench(c: &mut Criterion) {
let (_, mut receiver_stream) = sut.read_events(client_id.clone());
{
let sender = sender.clone();
_ = runtime.handle().spawn(async move {
runtime.handle().spawn(async move {
let mut count: usize = 0;
while (receiver_stream.next().await).is_some() {
count += 1;
Expand Down
2 changes: 1 addition & 1 deletion ess/src/ess.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ where
{
let client_by_id = self.client_by_id.read().unwrap();
match client_by_id.get(client_id) {
Some(client) => client.subscriptions.iter().map(|(id, _)| id.clone()).collect(),
Some(client) => client.subscriptions.keys().cloned().collect(),
None => vec![],
}
}
Expand Down
5 changes: 2 additions & 3 deletions examples/applications/lt-consumer/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ async fn wain() -> Result<(), Error> {
let invoke_count: u64 = env(TARGET_INVOKE_COUNT_ENV).unwrap();
let target_rate: u32 = env(TARGET_RATE_ENV).unwrap();
let collect_docker_stats = env(COLLECT_DOCKER_STATS_ENV).unwrap_or(false);
let chunk_execution_duration =
Duration::from_millis(1_000 * CHUNK_SIZE as u64 / target_rate as u64);
let chunk_execution_duration = Duration::from_millis(1_000 * CHUNK_SIZE / target_rate as u64);

let chariott = GrpcChariott::connect().await?;
let latency_metric = Arc::new(Mutex::new(Summary::with_defaults()));
Expand Down Expand Up @@ -104,7 +103,7 @@ async fn wain() -> Result<(), Error> {
let latency_metric = Arc::clone(&latency_metric);
let invoke_fulfillments = Arc::clone(&invoke_fulfillments);

_ = tokio::task::spawn(async move {
tokio::task::spawn(async move {
// Measure the latency based on the sample rate.
let now = if c % SAMPLE_RATE == 0 { Some(Instant::now()) } else { None };

Expand Down
2 changes: 1 addition & 1 deletion examples/applications/simple-provider/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ async fn register_and_announce_provider(
ttl_seconds: u64,
) -> Result<(), Error> {
// Initiate registration and announce thread.
_ = tokio::task::spawn(async move {
tokio::task::spawn(async move {
let mut client = None;

// Loop that handles provider registration and announce heartbeat pattern.
Expand Down
2 changes: 1 addition & 1 deletion examples/common/src/chariott/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub async fn register(
// Potential race condition if we register before the server is up.
// Since this is only an example, we do not ensure that the race does not
// happen.
_ = tokio::task::spawn(registration.register());
tokio::task::spawn(registration.register());

Ok((announce_url, socket_address))
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.65"
channel = "1.70"
4 changes: 2 additions & 2 deletions src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ impl<T: Observer> Registry<T> {
change_series.observe(&self.observer, self);

self.known_services
.iter()
.map(|(_, ts)| *ts + ttl)
.values()
.map(|ts| *ts + ttl)
.min()
.map(|t| (Specific, t))
.unwrap_or((Default, timestamp + ttl))
Expand Down
2 changes: 1 addition & 1 deletion tests/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl Provider {
socket.bind(SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port)).unwrap();
let listener = TcpListenerStream::new(socket.listen(2).unwrap());

_ = spawn(
spawn(
Server::builder()
.add_service(ProviderServiceServer::new(self))
.serve_with_incoming(listener),
Expand Down
Loading