Skip to content

Commit

Permalink
Cargo fmt code and apply lint suggestions
Browse files Browse the repository at this point in the history 
Signed-off-by: Kate Goldenring <[email protected]>
  • Loading branch information
@kate-goldenring
kate-goldenring committed Oct 2, 2024
1 parent 5361378 commit 3082e50
Show file tree
Hide file tree
Showing 18 changed files with 605 additions and 844 deletions.
11 changes: 10 additions & 1 deletion Cross.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,13 @@ passthrough = [
"PKG_CONFIG_ALLOW_CROSS",
"RUST_LOG",
"CARGO_INCREMENTAL",
]
]

[target.x86_64-unknown-linux-gnu]
image = "ghcr.io/project-akri/akri/rust-crossbuild:x86_64-unknown-linux-gnu-0.1.16-0.0.7"

[target.armv7-unknown-linux-gnueabihf]
image = "ghcr.io/project-akri/akri/rust-crossbuild:armv7-unknown-linux-gnueabihf-0.1.16-0.0.7"

[target.aarch64-unknown-linux-gnu]
image = "ghcr.io/project-akri/akri/rust-crossbuild:aarch64-unknown-linux-gnu-0.1.16-0.0.7"
2 changes: 1 addition & 1 deletion agent/src/plugin_manager/device_plugin_instance_controller.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ impl InstanceDevicePlugin {
let mut modified = false;
for (k, v) in new_slots.iter() {
if current[*k] != *v {
current[*k] = v.to_owned();
v.clone_into(&mut current[*k]);
modified = true;
}
}
Expand Down
131 changes: 48 additions & 83 deletions agent/src/plugin_manager/v1.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ pub struct NumaNode {
/// Generated client implementations.
pub mod pod_resources_lister_client {
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
use tonic::codegen::*;
use tonic::codegen::http::Uri;
use tonic::codegen::*;
/// PodResourcesLister is a service provided by the kubelet that provides information about the
/// node resources consumed by pods and containers on the node
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -134,9 +134,8 @@ pub mod pod_resources_lister_client {
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
>,
>,
<T as tonic::codegen::Service<
http::Request<tonic::body::BoxBody>,
>>::Error: Into<StdError> + Send + Sync,
<T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
Into<StdError> + Send + Sync,
{
PodResourcesListerClient::new(InterceptedService::new(inner, interceptor))
}
Expand Down Expand Up @@ -174,23 +173,16 @@ pub mod pod_resources_lister_client {
pub async fn list(
&mut self,
request: impl tonic::IntoRequest<super::ListPodResourcesRequest>,
) -> std::result::Result<
tonic::Response<super::ListPodResourcesResponse>,
tonic::Status,
> {
self.inner
.ready()
.await
.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
) -> std::result::Result<tonic::Response<super::ListPodResourcesResponse>, tonic::Status>
{
self.inner.ready().await.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/v1.PodResourcesLister/List",
);
let path = http::uri::PathAndQuery::from_static("/v1.PodResourcesLister/List");
let mut req = request.into_request();
req.extensions_mut()
.insert(GrpcMethod::new("v1.PodResourcesLister", "List"));
Expand All @@ -199,28 +191,23 @@ pub mod pod_resources_lister_client {
pub async fn get_allocatable_resources(
&mut self,
request: impl tonic::IntoRequest<super::AllocatableResourcesRequest>,
) -> std::result::Result<
tonic::Response<super::AllocatableResourcesResponse>,
tonic::Status,
> {
self.inner
.ready()
.await
.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
) -> std::result::Result<tonic::Response<super::AllocatableResourcesResponse>, tonic::Status>
{
self.inner.ready().await.map_err(|e| {
tonic::Status::new(
tonic::Code::Unknown,
format!("Service was not ready: {}", e.into()),
)
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/v1.PodResourcesLister/GetAllocatableResources",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new("v1.PodResourcesLister", "GetAllocatableResources"),
);
req.extensions_mut().insert(GrpcMethod::new(
"v1.PodResourcesLister",
"GetAllocatableResources",
));
self.inner.unary(req, path, codec).await
}
}
Expand All @@ -235,17 +222,11 @@ pub mod pod_resources_lister_server {
async fn list(
&self,
request: tonic::Request<super::ListPodResourcesRequest>,
) -> std::result::Result<
tonic::Response<super::ListPodResourcesResponse>,
tonic::Status,
>;
) -> std::result::Result<tonic::Response<super::ListPodResourcesResponse>, tonic::Status>;
async fn get_allocatable_resources(
&self,
request: tonic::Request<super::AllocatableResourcesRequest>,
) -> std::result::Result<
tonic::Response<super::AllocatableResourcesResponse>,
tonic::Status,
>;
) -> std::result::Result<tonic::Response<super::AllocatableResourcesResponse>, tonic::Status>;
}
/// PodResourcesLister is a service provided by the kubelet that provides information about the
/// node resources consumed by pods and containers on the node
Expand All @@ -272,10 +253,7 @@ pub mod pod_resources_lister_server {
max_encoding_message_size: None,
}
}
pub fn with_interceptor<F>(
inner: T,
interceptor: F,
) -> InterceptedService<Self, F>
pub fn with_interceptor<F>(inner: T, interceptor: F) -> InterceptedService<Self, F>
where
F: tonic::service::Interceptor,
{
Expand Down Expand Up @@ -331,15 +309,11 @@ pub mod pod_resources_lister_server {
"/v1.PodResourcesLister/List" => {
#[allow(non_camel_case_types)]
struct ListSvc<T: PodResourcesLister>(pub Arc<T>);
impl<
T: PodResourcesLister,
> tonic::server::UnaryService<super::ListPodResourcesRequest>
for ListSvc<T> {
impl<T: PodResourcesLister>
tonic::server::UnaryService<super::ListPodResourcesRequest> for ListSvc<T>
{
type Response = super::ListPodResourcesResponse;
type Future = BoxFuture<
tonic::Response<Self::Response>,
tonic::Status,
>;
type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
fn call(
&mut self,
request: tonic::Request<super::ListPodResourcesRequest>,
Expand Down Expand Up @@ -377,26 +351,22 @@ pub mod pod_resources_lister_server {
"/v1.PodResourcesLister/GetAllocatableResources" => {
#[allow(non_camel_case_types)]
struct GetAllocatableResourcesSvc<T: PodResourcesLister>(pub Arc<T>);
impl<
T: PodResourcesLister,
> tonic::server::UnaryService<super::AllocatableResourcesRequest>
for GetAllocatableResourcesSvc<T> {
impl<T: PodResourcesLister>
tonic::server::UnaryService<super::AllocatableResourcesRequest>
for GetAllocatableResourcesSvc<T>
{
type Response = super::AllocatableResourcesResponse;
type Future = BoxFuture<
tonic::Response<Self::Response>,
tonic::Status,
>;
type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
fn call(
&mut self,
request: tonic::Request<super::AllocatableResourcesRequest>,
) -> Self::Future {
let inner = Arc::clone(&self.0);
let fut = async move {
<T as PodResourcesLister>::get_allocatable_resources(
&inner,
request,
)
.await
&inner, request,
)
.await
};
Box::pin(fut)
}
Expand Down Expand Up @@ -424,18 +394,14 @@ pub mod pod_resources_lister_server {
};
Box::pin(fut)
}
_ => {
Box::pin(async move {
Ok(
http::Response::builder()
.status(200)
.header("grpc-status", "12")
.header("content-type", "application/grpc")
.body(empty_body())
.unwrap(),
)
})
}
_ => Box::pin(async move {
Ok(http::Response::builder()
.status(200)
.header("grpc-status", "12")
.header("content-type", "application/grpc")
.body(empty_body())
.unwrap())
}),
}
}
}
Expand All @@ -461,8 +427,7 @@ pub mod pod_resources_lister_server {
write!(f, "{:?}", self.0)
}
}
impl<T: PodResourcesLister> tonic::server::NamedService
for PodResourcesListerServer<T> {
impl<T: PodResourcesLister> tonic::server::NamedService for PodResourcesListerServer<T> {
const NAME: &'static str = "v1.PodResourcesLister";
}
}
Loading

0 comments on commit 3082e50

Please sign in to comment.