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

Update Breaking Changes #2496

Merged
merged 1 commit into from
Jan 16, 2025
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
9 changes: 9 additions & 0 deletions database/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM rustlang/rust:nightly-bookworm-slim AS rust

FROM rust as builder

COPY . .
RUN apt-get update && apt-get install -y clang python3 python3-pip
RUN pip install cmake --break-system-packages

RUN python3 ./x.py build -- database
4 changes: 2 additions & 2 deletions discord-frontend/Cargo.lock

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

8 changes: 4 additions & 4 deletions discord-frontend/hartex-discord-entitycache-macros/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ fn extract_archive<R: Read + Seek>(reader: R, output_dir: &Path) {

fn generate_lazy_static_from_item_enum(item_enum: &ItemEnum) -> TokenStream {
let ident = &item_enum.ident;
let const_name = ident.to_string().to_case(Case::ScreamingSnake);
let const_name = ident.to_string().to_case(Case::Constant);
let const_ident = TokenStream::from_str(&const_name).unwrap();

let generic_params = item_enum
Expand Down Expand Up @@ -304,7 +304,7 @@ fn generate_lazy_static_from_item_enum(item_enum: &ItemEnum) -> TokenStream {

fn generate_lazy_static_from_item_struct(item_struct: &ItemStruct) -> TokenStream {
let ident = &item_struct.ident;
let const_name = ident.to_string().to_case(Case::ScreamingSnake);
let const_name = ident.to_string().to_case(Case::Constant);
let const_ident = TokenStream::from_str(&const_name).unwrap();

let generic_params = item_struct
Expand Down Expand Up @@ -425,7 +425,7 @@ fn generate_enum_metadata_map(tree: &ModuleTree) -> TokenStream {
let value_path_name = format!(
"{}::{}",
&path[16..(path.len() - (struct_name.len() + 2))],
struct_name.to_case(Case::ScreamingSnake),
struct_name.to_case(Case::Constant),
);
let value_path: syn::Path = syn::parse_str(&value_path_name).unwrap();

Expand Down Expand Up @@ -459,7 +459,7 @@ fn generate_struct_metadata_map(tree: &ModuleTree) -> TokenStream {
let value_path_name = format!(
"{}::{}",
&path[16..(path.len() - (struct_name.len() + 2))],
struct_name.to_case(Case::ScreamingSnake),
struct_name.to_case(Case::Constant),
);
let value_path: syn::Path = syn::parse_str(&value_path_name).unwrap();

Expand Down
3 changes: 3 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
services:
api-backend:
container_name: api-1
build:
dockerfile: api-backend/Dockerfile
context: ..
ports:
- "3333:3333"
database:
container_name: db-1
proxy:
image: twilightrs/http-proxy:metrics
container_name: proxy-1
Expand Down
Loading