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

chore: fix the agama-server crate name #1072

Merged
merged 1 commit into from
Mar 5, 2024
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
86 changes: 43 additions & 43 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/agama-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "agama-dbus-server"
name = "agama-server"
version = "0.1.0"
edition = "2021"
rust-version.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion rust/agama-server/src/agama-dbus-server.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use agama_dbus_server::{
use agama_server::{
l10n::{self, helpers},
network, questions,
};
Expand Down
4 changes: 2 additions & 2 deletions rust/agama-server/src/agama-web-server.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::process::{ExitCode, Termination};

use agama_dbus_server::{
use agama_lib::connection_to;
use agama_server::{
l10n::helpers,
web::{self, run_monitor},
};
use agama_lib::connection_to;
use clap::{Args, Parser, Subcommand};
use tokio::sync::broadcast::channel;
use tracing_subscriber::prelude::*;
Expand Down
2 changes: 1 addition & 1 deletion rust/agama-server/tests/l10n.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod common;

use agama_dbus_server::l10n::web::l10n_service;
use agama_server::l10n::web::l10n_service;
use axum::{
body::Body,
http::{Request, StatusCode},
Expand Down
10 changes: 5 additions & 5 deletions rust/agama-server/tests/network.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
pub mod common;

use self::common::{async_retry, DBusServer};
use agama_dbus_server::network::{
self,
model::{self, Ipv4Method, Ipv6Method},
Adapter, NetworkAdapterError, NetworkService, NetworkState,
};
use agama_lib::network::{
settings::{self},
types::DeviceType,
NetworkClient,
};
use agama_server::network::{
self,
model::{self, Ipv4Method, Ipv6Method},
Adapter, NetworkAdapterError, NetworkService, NetworkState,
};
use async_trait::async_trait;
use cidr::IpInet;
use std::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion rust/agama-server/tests/service.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod common;

use agama_dbus_server::{
use agama_server::{
service,
web::{generate_token, MainServiceBuilder, ServiceConfig},
};
Expand Down
Loading