Skip to content

Commit

Permalink
Fix build with updated toolchain (#996)
Browse files Browse the repository at this point in the history
  • Loading branch information
BartoszCiesla authored Jun 15, 2024
1 parent 2f66ffb commit 4b265ea
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 23 deletions.
48 changes: 25 additions & 23 deletions cli/src/args/mod.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
pub(crate) mod client;
pub(crate) mod common;
pub(crate) mod consumer_group;
pub(crate) mod consumer_offset;
pub(crate) mod context;
pub(crate) mod message;
pub(crate) mod partition;
pub(crate) mod permissions;
pub(crate) mod personal_access_token;
pub(crate) mod stream;
pub(crate) mod system;
pub(crate) mod topic;
pub(crate) mod user;
use std::path::PathBuf;

use clap::{Args, Command as ClapCommand};
use clap::{Parser, Subcommand};
use clap_complete::{generate, Generator, Shell};
use figlet_rs::FIGfont;

use iggy::args::{Args as IggyArgs, ArgsOptional as IggyArgsOptional};
use iggy::cli::context::common::ContextConfig;

use self::user::UserAction;
use crate::args::{
client::ClientAction,
consumer_group::ConsumerGroupAction,
Expand All @@ -25,13 +20,22 @@ use crate::args::{
system::{LoginArgs, PingArgs, StatsArgs},
topic::TopicAction,
};
use clap::{Args, Command as ClapCommand};
use clap::{Parser, Subcommand};
use clap_complete::{generate, Generator, Shell};
use figlet_rs::FIGfont;
use iggy::args::{Args as IggyArgs, ArgsOptional as IggyArgsOptional};
use iggy::cli::context::common::ContextConfig;
use std::path::PathBuf;

use self::user::UserAction;

pub(crate) mod client;
pub(crate) mod common;
pub(crate) mod consumer_group;
pub(crate) mod consumer_offset;
pub(crate) mod context;
pub(crate) mod message;
pub(crate) mod partition;
pub(crate) mod permissions;
pub(crate) mod personal_access_token;
pub(crate) mod stream;
pub(crate) mod system;
pub(crate) mod topic;
pub(crate) mod user;

static CARGO_BIN_NAME: &str = env!("CARGO_BIN_NAME");
static CARGO_PKG_HOMEPAGE: &str = env!("CARGO_PKG_HOMEPAGE");
Expand Down Expand Up @@ -204,7 +208,6 @@ impl IggyConsoleArgs {
pub struct IggyMergedConsoleArgs {
pub iggy: IggyArgs,
pub cli: CliOptions,
pub command: Option<Command>,
}

impl IggyMergedConsoleArgs {
Expand All @@ -222,7 +225,6 @@ impl IggyMergedConsoleArgs {
Self {
iggy: IggyArgs::from(vec![context.iggy, args.iggy]),
cli: merged_cli_options,
command: args.command,
}
}
}
1 change: 1 addition & 0 deletions server/src/http/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub struct AppState {

#[derive(Debug, Copy, Clone)]
pub struct RequestDetails {
#[allow(dead_code)]
pub request_id: Ulid,
pub ip_address: SocketAddr,
}

0 comments on commit 4b265ea

Please sign in to comment.