mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
misc: Adapt consistent import style formatting
Historically the Cloud Hypervisor coding style has been to ensure that all imports are ordered and placed in a single group. Unfortunately cargo fmt has no support for ensuring that all imports are in a single group so if whitespace lines were added as part of the import statements then they would only be odered correctly in the group. By adopting "group_imports="StdExternalCrate" we can enforce a style where imports are placed in at most three groups for std, external crates and the crate itself. Choosing a style enforceable by the tooling reduces the reviewer burden. Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
// Copyright 2023 Crusoe Energy Systems LLC
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use crate::{RateLimiter, TokenType};
|
||||
use core::panic::AssertUnwindSafe;
|
||||
use std::fs::File;
|
||||
use std::io;
|
||||
@@ -12,9 +11,12 @@ use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
|
||||
use std::result;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::thread;
|
||||
|
||||
use thiserror::Error;
|
||||
use vmm_sys_util::eventfd::EventFd;
|
||||
|
||||
use crate::{RateLimiter, TokenType};
|
||||
|
||||
/// Errors associated with rate-limiter group.
|
||||
#[derive(Debug, Error)]
|
||||
pub enum Error {
|
||||
@@ -298,10 +300,12 @@ impl Drop for RateLimiterGroup {
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) mod tests {
|
||||
use std::{os::fd::AsRawFd, thread, time::Duration};
|
||||
|
||||
use vmm_sys_util::eventfd::EventFd;
|
||||
|
||||
use super::RateLimiterGroupHandle;
|
||||
use crate::{group::RateLimiterGroup, TokenBucket, TokenType, REFILL_TIMER_INTERVAL_MS};
|
||||
use std::{os::fd::AsRawFd, thread, time::Duration};
|
||||
use vmm_sys_util::eventfd::EventFd;
|
||||
|
||||
impl RateLimiterGroupHandle {
|
||||
pub fn bandwidth(&self) -> Option<TokenBucket> {
|
||||
|
||||
@@ -51,6 +51,7 @@ use std::os::unix::io::{AsRawFd, RawFd};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Mutex;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use vmm_sys_util::timerfd::TimerFd;
|
||||
|
||||
/// Module for group rate limiting.
|
||||
@@ -519,10 +520,11 @@ impl Default for RateLimiter {
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) mod tests {
|
||||
use super::*;
|
||||
use std::fmt;
|
||||
use std::thread;
|
||||
|
||||
use super::*;
|
||||
|
||||
impl TokenBucket {
|
||||
// Resets the token bucket: budget set to max capacity and last-updated set to now.
|
||||
fn reset(&mut self) {
|
||||
|
||||
Reference in New Issue
Block a user