mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-11-26 19:22:29 +00:00
ci: use nightly rustfmt
we were using this before, but it broke when refactoring the flake out into separate files
This commit is contained in:
parent
6398136163
commit
fd19dda5cb
@ -23,7 +23,7 @@ mkShell {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Development tools
|
# Development tools
|
||||||
nativeBuildInputs = default.nativeBuildInputs ++ [
|
nativeBuildInputs = [
|
||||||
# Always use nightly rustfmt because most of its options are unstable
|
# Always use nightly rustfmt because most of its options are unstable
|
||||||
#
|
#
|
||||||
# This needs to come before `toolchain` in this list, otherwise
|
# This needs to come before `toolchain` in this list, otherwise
|
||||||
@ -57,5 +57,5 @@ mkShell {
|
|||||||
|
|
||||||
# Useful for editing the book locally
|
# Useful for editing the book locally
|
||||||
mdbook
|
mdbook
|
||||||
];
|
] ++ default.nativeBuildInputs ;
|
||||||
}
|
}
|
||||||
|
@ -7,8 +7,11 @@ use axum::{
|
|||||||
response::{IntoResponse, Response},
|
response::{IntoResponse, Response},
|
||||||
RequestExt, RequestPartsExt,
|
RequestExt, RequestPartsExt,
|
||||||
};
|
};
|
||||||
use axum_extra::headers::authorization::Bearer;
|
use axum_extra::{
|
||||||
use axum_extra::{headers::Authorization, typed_header::TypedHeaderRejectionReason, TypedHeader};
|
headers::{authorization::Bearer, Authorization},
|
||||||
|
typed_header::TypedHeaderRejectionReason,
|
||||||
|
TypedHeader,
|
||||||
|
};
|
||||||
use bytes::{BufMut, BytesMut};
|
use bytes::{BufMut, BytesMut};
|
||||||
use http::{Request, StatusCode};
|
use http::{Request, StatusCode};
|
||||||
use ruma::{
|
use ruma::{
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
mod data;
|
mod data;
|
||||||
pub use data::Data;
|
pub use data::{Data, SigningKeys};
|
||||||
pub use data::SigningKeys;
|
use ruma::{
|
||||||
use ruma::MilliSecondsSinceUnixEpoch;
|
serde::Base64, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedEventId, OwnedRoomAliasId,
|
||||||
use ruma::{serde::Base64, OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedServerName, OwnedUserId};
|
OwnedRoomId, OwnedServerName, OwnedUserId, RoomAliasId,
|
||||||
use ruma::{OwnedRoomAliasId, RoomAliasId};
|
};
|
||||||
|
|
||||||
use crate::api::server_server::FedDest;
|
use crate::api::server_server::FedDest;
|
||||||
|
|
||||||
@ -16,7 +16,6 @@ use ruma::{
|
|||||||
api::{client::sync::sync_events, federation::discovery::ServerSigningKeys},
|
api::{client::sync::sync_events, federation::discovery::ServerSigningKeys},
|
||||||
DeviceId, RoomVersionId, ServerName, UserId,
|
DeviceId, RoomVersionId, ServerName, UserId,
|
||||||
};
|
};
|
||||||
use std::str::FromStr;
|
|
||||||
use std::{
|
use std::{
|
||||||
collections::{BTreeMap, HashMap},
|
collections::{BTreeMap, HashMap},
|
||||||
error::Error as StdError,
|
error::Error as StdError,
|
||||||
@ -25,6 +24,7 @@ use std::{
|
|||||||
iter,
|
iter,
|
||||||
net::{IpAddr, SocketAddr},
|
net::{IpAddr, SocketAddr},
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
|
str::FromStr,
|
||||||
sync::{
|
sync::{
|
||||||
atomic::{self, AtomicBool},
|
atomic::{self, AtomicBool},
|
||||||
Arc, RwLock as StdRwLock,
|
Arc, RwLock as StdRwLock,
|
||||||
|
Loading…
Reference in New Issue
Block a user