Merge pull request #17 from robertdodd/fix-warnings

Fix minor clippy and rust-analyzer warnings
This commit is contained in:
JMS55 2024-01-02 23:48:25 -08:00 committed by GitHub
commit 23a8f7fd33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 277 additions and 275 deletions

View File

@ -360,14 +360,14 @@ impl BevyTemplateNode {
.spawn((
NodeBundle {
style: style.style.clone(),
border_color: style.border_color.clone(),
background_color: style.background_color.clone(),
transform: style.transform.clone(),
visibility: style.visibility.clone(),
z_index: style.z_index.clone(),
border_color: style.border_color,
background_color: style.background_color,
transform: style.transform,
visibility: style.visibility,
z_index: style.z_index,
..default()
},
style.outline.clone(),
style.outline,
))
.push_children(&children)
.id()
@ -383,20 +383,20 @@ impl BevyTemplateNode {
.collect::<Box<[_]>>();
world
.spawn(NodeBundle {
border_color: style.border_color.clone(),
border_color: style.border_color,
..default()
})
.insert((
TextBundle {
text: text.clone(),
style: style.style.clone(),
background_color: style.background_color.clone(),
transform: style.transform.clone(),
visibility: style.visibility.clone(),
z_index: style.z_index.clone(),
background_color: style.background_color,
transform: style.transform,
visibility: style.visibility,
z_index: style.z_index,
..default()
},
style.outline.clone(),
style.outline,
))
.push_children(&children)
.id()
@ -412,20 +412,20 @@ impl BevyTemplateNode {
.collect::<Box<[_]>>();
world
.spawn(NodeBundle {
border_color: style.border_color.clone(),
border_color: style.border_color,
..default()
})
.insert((
ImageBundle {
image: image.clone(),
style: style.style.clone(),
background_color: style.background_color.clone(),
transform: style.transform.clone(),
visibility: style.visibility.clone(),
z_index: style.z_index.clone(),
background_color: style.background_color,
transform: style.transform,
visibility: style.visibility,
z_index: style.z_index,
..default()
},
style.outline.clone(),
style.outline,
))
.push_children(&children)
.id()

View File

@ -1,269 +1,269 @@
// Tailwind v3.4.0 https://tailwindcss.com/docs/customizing-colors
pub const BLACK: &'static str = "#000000";
pub const WHITE: &'static str = "#ffffff";
pub const TRANSPARENT: &'static str = "#00000000";
pub const BLACK: &str = "#000000";
pub const WHITE: &str = "#ffffff";
pub const TRANSPARENT: &str = "#00000000";
pub const SLATE_50: &'static str = "#f8fafc";
pub const SLATE_100: &'static str = "#f1f5f9";
pub const SLATE_200: &'static str = "#e2e8f0";
pub const SLATE_300: &'static str = "#cbd5e1";
pub const SLATE_400: &'static str = "#94a3b8";
pub const SLATE_500: &'static str = "#64748b";
pub const SLATE_600: &'static str = "#475569";
pub const SLATE_700: &'static str = "#334155";
pub const SLATE_800: &'static str = "#1e293b";
pub const SLATE_900: &'static str = "#0f172a";
pub const SLATE_950: &'static str = "#020617";
pub const SLATE_50: &str = "#f8fafc";
pub const SLATE_100: &str = "#f1f5f9";
pub const SLATE_200: &str = "#e2e8f0";
pub const SLATE_300: &str = "#cbd5e1";
pub const SLATE_400: &str = "#94a3b8";
pub const SLATE_500: &str = "#64748b";
pub const SLATE_600: &str = "#475569";
pub const SLATE_700: &str = "#334155";
pub const SLATE_800: &str = "#1e293b";
pub const SLATE_900: &str = "#0f172a";
pub const SLATE_950: &str = "#020617";
pub const GRAY_50: &'static str = "#f9fafb";
pub const GRAY_100: &'static str = "#f3f4f6";
pub const GRAY_200: &'static str = "#e5e7eb";
pub const GRAY_300: &'static str = "#d1d5db";
pub const GRAY_400: &'static str = "#9ca3af";
pub const GRAY_500: &'static str = "#6b7280";
pub const GRAY_600: &'static str = "#4b5563";
pub const GRAY_700: &'static str = "#374151";
pub const GRAY_800: &'static str = "#1f2937";
pub const GRAY_900: &'static str = "#111827";
pub const GRAY_950: &'static str = "#030712";
pub const GRAY_50: &str = "#f9fafb";
pub const GRAY_100: &str = "#f3f4f6";
pub const GRAY_200: &str = "#e5e7eb";
pub const GRAY_300: &str = "#d1d5db";
pub const GRAY_400: &str = "#9ca3af";
pub const GRAY_500: &str = "#6b7280";
pub const GRAY_600: &str = "#4b5563";
pub const GRAY_700: &str = "#374151";
pub const GRAY_800: &str = "#1f2937";
pub const GRAY_900: &str = "#111827";
pub const GRAY_950: &str = "#030712";
pub const ZINC_50: &'static str = "#fafafa";
pub const ZINC_100: &'static str = "#f4f4f5";
pub const ZINC_200: &'static str = "#e4e4e7";
pub const ZINC_300: &'static str = "#d4d4d8";
pub const ZINC_400: &'static str = "#a1a1aa";
pub const ZINC_500: &'static str = "#71717a";
pub const ZINC_600: &'static str = "#52525b";
pub const ZINC_700: &'static str = "#3f3f46";
pub const ZINC_800: &'static str = "#27272a";
pub const ZINC_900: &'static str = "#18181b";
pub const ZINC_950: &'static str = "#09090b";
pub const ZINC_50: &str = "#fafafa";
pub const ZINC_100: &str = "#f4f4f5";
pub const ZINC_200: &str = "#e4e4e7";
pub const ZINC_300: &str = "#d4d4d8";
pub const ZINC_400: &str = "#a1a1aa";
pub const ZINC_500: &str = "#71717a";
pub const ZINC_600: &str = "#52525b";
pub const ZINC_700: &str = "#3f3f46";
pub const ZINC_800: &str = "#27272a";
pub const ZINC_900: &str = "#18181b";
pub const ZINC_950: &str = "#09090b";
pub const NEUTRAL_50: &'static str = "#fafafa";
pub const NEUTRAL_100: &'static str = "#f5f5f5";
pub const NEUTRAL_200: &'static str = "#e5e5e5";
pub const NEUTRAL_300: &'static str = "#d4d4d4";
pub const NEUTRAL_400: &'static str = "#a3a3a3";
pub const NEUTRAL_500: &'static str = "#737373";
pub const NEUTRAL_600: &'static str = "#525252";
pub const NEUTRAL_700: &'static str = "#404040";
pub const NEUTRAL_800: &'static str = "#262626";
pub const NEUTRAL_900: &'static str = "#171717";
pub const NEUTRAL_950: &'static str = "#0a0a0a";
pub const NEUTRAL_50: &str = "#fafafa";
pub const NEUTRAL_100: &str = "#f5f5f5";
pub const NEUTRAL_200: &str = "#e5e5e5";
pub const NEUTRAL_300: &str = "#d4d4d4";
pub const NEUTRAL_400: &str = "#a3a3a3";
pub const NEUTRAL_500: &str = "#737373";
pub const NEUTRAL_600: &str = "#525252";
pub const NEUTRAL_700: &str = "#404040";
pub const NEUTRAL_800: &str = "#262626";
pub const NEUTRAL_900: &str = "#171717";
pub const NEUTRAL_950: &str = "#0a0a0a";
pub const STONE_50: &'static str = "#fafaf9";
pub const STONE_100: &'static str = "#f5f5f4";
pub const STONE_200: &'static str = "#e7e5e4";
pub const STONE_300: &'static str = "#d6d3d1";
pub const STONE_400: &'static str = "#a8a29e";
pub const STONE_500: &'static str = "#78716c";
pub const STONE_600: &'static str = "#57534e";
pub const STONE_700: &'static str = "#44403c";
pub const STONE_800: &'static str = "#292524";
pub const STONE_900: &'static str = "#1c1917";
pub const STONE_950: &'static str = "#0c0a09";
pub const STONE_50: &str = "#fafaf9";
pub const STONE_100: &str = "#f5f5f4";
pub const STONE_200: &str = "#e7e5e4";
pub const STONE_300: &str = "#d6d3d1";
pub const STONE_400: &str = "#a8a29e";
pub const STONE_500: &str = "#78716c";
pub const STONE_600: &str = "#57534e";
pub const STONE_700: &str = "#44403c";
pub const STONE_800: &str = "#292524";
pub const STONE_900: &str = "#1c1917";
pub const STONE_950: &str = "#0c0a09";
pub const RED_50: &'static str = "#fef2f2";
pub const RED_100: &'static str = "#fee2e2";
pub const RED_200: &'static str = "#fecaca";
pub const RED_300: &'static str = "#fca5a5";
pub const RED_400: &'static str = "#f87171";
pub const RED_500: &'static str = "#ef4444";
pub const RED_600: &'static str = "#dc2626";
pub const RED_700: &'static str = "#b91c1c";
pub const RED_800: &'static str = "#991b1b";
pub const RED_900: &'static str = "#7f1d1d";
pub const RED_950: &'static str = "#450a0a";
pub const RED_50: &str = "#fef2f2";
pub const RED_100: &str = "#fee2e2";
pub const RED_200: &str = "#fecaca";
pub const RED_300: &str = "#fca5a5";
pub const RED_400: &str = "#f87171";
pub const RED_500: &str = "#ef4444";
pub const RED_600: &str = "#dc2626";
pub const RED_700: &str = "#b91c1c";
pub const RED_800: &str = "#991b1b";
pub const RED_900: &str = "#7f1d1d";
pub const RED_950: &str = "#450a0a";
pub const ORANGE_50: &'static str = "#fff7ed";
pub const ORANGE_100: &'static str = "#ffedd5";
pub const ORANGE_200: &'static str = "#fed7aa";
pub const ORANGE_300: &'static str = "#fdba74";
pub const ORANGE_400: &'static str = "#fb923c";
pub const ORANGE_500: &'static str = "#f97316";
pub const ORANGE_600: &'static str = "#ea580c";
pub const ORANGE_700: &'static str = "#c2410c";
pub const ORANGE_800: &'static str = "#9a3412";
pub const ORANGE_900: &'static str = "#7c2d12";
pub const ORANGE_950: &'static str = "#431407";
pub const ORANGE_50: &str = "#fff7ed";
pub const ORANGE_100: &str = "#ffedd5";
pub const ORANGE_200: &str = "#fed7aa";
pub const ORANGE_300: &str = "#fdba74";
pub const ORANGE_400: &str = "#fb923c";
pub const ORANGE_500: &str = "#f97316";
pub const ORANGE_600: &str = "#ea580c";
pub const ORANGE_700: &str = "#c2410c";
pub const ORANGE_800: &str = "#9a3412";
pub const ORANGE_900: &str = "#7c2d12";
pub const ORANGE_950: &str = "#431407";
pub const AMBER_50: &'static str = "#fffbeb";
pub const AMBER_100: &'static str = "#fef3c7";
pub const AMBER_200: &'static str = "#fde68a";
pub const AMBER_300: &'static str = "#fcd34d";
pub const AMBER_400: &'static str = "#fbbf24";
pub const AMBER_500: &'static str = "#f59e0b";
pub const AMBER_600: &'static str = "#d97706";
pub const AMBER_700: &'static str = "#b45309";
pub const AMBER_800: &'static str = "#92400e";
pub const AMBER_900: &'static str = "#78350f";
pub const AMBER_950: &'static str = "#451a03";
pub const AMBER_50: &str = "#fffbeb";
pub const AMBER_100: &str = "#fef3c7";
pub const AMBER_200: &str = "#fde68a";
pub const AMBER_300: &str = "#fcd34d";
pub const AMBER_400: &str = "#fbbf24";
pub const AMBER_500: &str = "#f59e0b";
pub const AMBER_600: &str = "#d97706";
pub const AMBER_700: &str = "#b45309";
pub const AMBER_800: &str = "#92400e";
pub const AMBER_900: &str = "#78350f";
pub const AMBER_950: &str = "#451a03";
pub const YELLOW_50: &'static str = "#fefce8";
pub const YELLOW_100: &'static str = "#fef9c3";
pub const YELLOW_200: &'static str = "#fef08a";
pub const YELLOW_300: &'static str = "#fde047";
pub const YELLOW_400: &'static str = "#facc15";
pub const YELLOW_500: &'static str = "#eab308";
pub const YELLOW_600: &'static str = "#ca8a04";
pub const YELLOW_700: &'static str = "#a16207";
pub const YELLOW_800: &'static str = "#854d0e";
pub const YELLOW_900: &'static str = "#713f12";
pub const YELLOW_950: &'static str = "#422006";
pub const YELLOW_50: &str = "#fefce8";
pub const YELLOW_100: &str = "#fef9c3";
pub const YELLOW_200: &str = "#fef08a";
pub const YELLOW_300: &str = "#fde047";
pub const YELLOW_400: &str = "#facc15";
pub const YELLOW_500: &str = "#eab308";
pub const YELLOW_600: &str = "#ca8a04";
pub const YELLOW_700: &str = "#a16207";
pub const YELLOW_800: &str = "#854d0e";
pub const YELLOW_900: &str = "#713f12";
pub const YELLOW_950: &str = "#422006";
pub const LIME_50: &'static str = "#f7fee7";
pub const LIME_100: &'static str = "#ecfccb";
pub const LIME_200: &'static str = "#d9f99d";
pub const LIME_300: &'static str = "#bef264";
pub const LIME_400: &'static str = "#a3e635";
pub const LIME_500: &'static str = "#84cc16";
pub const LIME_600: &'static str = "#65a30d";
pub const LIME_700: &'static str = "#4d7c0f";
pub const LIME_800: &'static str = "#3f6212";
pub const LIME_900: &'static str = "#365314";
pub const LIME_950: &'static str = "#1a2e05";
pub const LIME_50: &str = "#f7fee7";
pub const LIME_100: &str = "#ecfccb";
pub const LIME_200: &str = "#d9f99d";
pub const LIME_300: &str = "#bef264";
pub const LIME_400: &str = "#a3e635";
pub const LIME_500: &str = "#84cc16";
pub const LIME_600: &str = "#65a30d";
pub const LIME_700: &str = "#4d7c0f";
pub const LIME_800: &str = "#3f6212";
pub const LIME_900: &str = "#365314";
pub const LIME_950: &str = "#1a2e05";
pub const GREEN_50: &'static str = "#f0fdf4";
pub const GREEN_100: &'static str = "#dcfce7";
pub const GREEN_200: &'static str = "#bbf7d0";
pub const GREEN_300: &'static str = "#86efac";
pub const GREEN_400: &'static str = "#4ade80";
pub const GREEN_500: &'static str = "#22c55e";
pub const GREEN_600: &'static str = "#16a34a";
pub const GREEN_700: &'static str = "#15803d";
pub const GREEN_800: &'static str = "#166534";
pub const GREEN_900: &'static str = "#14532d";
pub const GREEN_950: &'static str = "#052e16";
pub const GREEN_50: &str = "#f0fdf4";
pub const GREEN_100: &str = "#dcfce7";
pub const GREEN_200: &str = "#bbf7d0";
pub const GREEN_300: &str = "#86efac";
pub const GREEN_400: &str = "#4ade80";
pub const GREEN_500: &str = "#22c55e";
pub const GREEN_600: &str = "#16a34a";
pub const GREEN_700: &str = "#15803d";
pub const GREEN_800: &str = "#166534";
pub const GREEN_900: &str = "#14532d";
pub const GREEN_950: &str = "#052e16";
pub const EMERALD_50: &'static str = "#ecfdf5";
pub const EMERALD_100: &'static str = "#d1fae5";
pub const EMERALD_200: &'static str = "#a7f3d0";
pub const EMERALD_300: &'static str = "#6ee7b7";
pub const EMERALD_400: &'static str = "#34d399";
pub const EMERALD_500: &'static str = "#10b981";
pub const EMERALD_600: &'static str = "#059669";
pub const EMERALD_700: &'static str = "#047857";
pub const EMERALD_800: &'static str = "#065f46";
pub const EMERALD_900: &'static str = "#064e3b";
pub const EMERALD_950: &'static str = "#022c22";
pub const EMERALD_50: &str = "#ecfdf5";
pub const EMERALD_100: &str = "#d1fae5";
pub const EMERALD_200: &str = "#a7f3d0";
pub const EMERALD_300: &str = "#6ee7b7";
pub const EMERALD_400: &str = "#34d399";
pub const EMERALD_500: &str = "#10b981";
pub const EMERALD_600: &str = "#059669";
pub const EMERALD_700: &str = "#047857";
pub const EMERALD_800: &str = "#065f46";
pub const EMERALD_900: &str = "#064e3b";
pub const EMERALD_950: &str = "#022c22";
pub const TEAL_50: &'static str = "#f0fdfa";
pub const TEAL_100: &'static str = "#ccfbf1";
pub const TEAL_200: &'static str = "#99f6e4";
pub const TEAL_300: &'static str = "#5eead4";
pub const TEAL_400: &'static str = "#2dd4bf";
pub const TEAL_500: &'static str = "#14b8a6";
pub const TEAL_600: &'static str = "#0d9488";
pub const TEAL_700: &'static str = "#0f766e";
pub const TEAL_800: &'static str = "#115e59";
pub const TEAL_900: &'static str = "#134e4a";
pub const TEAL_950: &'static str = "#042f2e";
pub const TEAL_50: &str = "#f0fdfa";
pub const TEAL_100: &str = "#ccfbf1";
pub const TEAL_200: &str = "#99f6e4";
pub const TEAL_300: &str = "#5eead4";
pub const TEAL_400: &str = "#2dd4bf";
pub const TEAL_500: &str = "#14b8a6";
pub const TEAL_600: &str = "#0d9488";
pub const TEAL_700: &str = "#0f766e";
pub const TEAL_800: &str = "#115e59";
pub const TEAL_900: &str = "#134e4a";
pub const TEAL_950: &str = "#042f2e";
pub const CYAN_50: &'static str = "#ecfeff";
pub const CYAN_100: &'static str = "#cffafe";
pub const CYAN_200: &'static str = "#a5f3fc";
pub const CYAN_300: &'static str = "#67e8f9";
pub const CYAN_400: &'static str = "#22d3ee";
pub const CYAN_500: &'static str = "#06b6d4";
pub const CYAN_600: &'static str = "#0891b2";
pub const CYAN_700: &'static str = "#0e7490";
pub const CYAN_800: &'static str = "#155e75";
pub const CYAN_900: &'static str = "#164e63";
pub const CYAN_950: &'static str = "#083344";
pub const CYAN_50: &str = "#ecfeff";
pub const CYAN_100: &str = "#cffafe";
pub const CYAN_200: &str = "#a5f3fc";
pub const CYAN_300: &str = "#67e8f9";
pub const CYAN_400: &str = "#22d3ee";
pub const CYAN_500: &str = "#06b6d4";
pub const CYAN_600: &str = "#0891b2";
pub const CYAN_700: &str = "#0e7490";
pub const CYAN_800: &str = "#155e75";
pub const CYAN_900: &str = "#164e63";
pub const CYAN_950: &str = "#083344";
pub const SKY_50: &'static str = "#f0f9ff";
pub const SKY_100: &'static str = "#e0f2fe";
pub const SKY_200: &'static str = "#bae6fd";
pub const SKY_300: &'static str = "#7dd3fc";
pub const SKY_400: &'static str = "#38bdf8";
pub const SKY_500: &'static str = "#0ea5e9";
pub const SKY_600: &'static str = "#0284c7";
pub const SKY_700: &'static str = "#0369a1";
pub const SKY_800: &'static str = "#075985";
pub const SKY_900: &'static str = "#0c4a6e";
pub const SKY_950: &'static str = "#082f49";
pub const SKY_50: &str = "#f0f9ff";
pub const SKY_100: &str = "#e0f2fe";
pub const SKY_200: &str = "#bae6fd";
pub const SKY_300: &str = "#7dd3fc";
pub const SKY_400: &str = "#38bdf8";
pub const SKY_500: &str = "#0ea5e9";
pub const SKY_600: &str = "#0284c7";
pub const SKY_700: &str = "#0369a1";
pub const SKY_800: &str = "#075985";
pub const SKY_900: &str = "#0c4a6e";
pub const SKY_950: &str = "#082f49";
pub const BLUE_50: &'static str = "#eff6ff";
pub const BLUE_100: &'static str = "#dbeafe";
pub const BLUE_200: &'static str = "#bfdbfe";
pub const BLUE_300: &'static str = "#93c5fd";
pub const BLUE_400: &'static str = "#60a5fa";
pub const BLUE_500: &'static str = "#3b82f6";
pub const BLUE_600: &'static str = "#2563eb";
pub const BLUE_700: &'static str = "#1d4ed8";
pub const BLUE_800: &'static str = "#1e40af";
pub const BLUE_900: &'static str = "#1e3a8a";
pub const BLUE_950: &'static str = "#172554";
pub const BLUE_50: &str = "#eff6ff";
pub const BLUE_100: &str = "#dbeafe";
pub const BLUE_200: &str = "#bfdbfe";
pub const BLUE_300: &str = "#93c5fd";
pub const BLUE_400: &str = "#60a5fa";
pub const BLUE_500: &str = "#3b82f6";
pub const BLUE_600: &str = "#2563eb";
pub const BLUE_700: &str = "#1d4ed8";
pub const BLUE_800: &str = "#1e40af";
pub const BLUE_900: &str = "#1e3a8a";
pub const BLUE_950: &str = "#172554";
pub const INDIGO_50: &'static str = "#eef2ff";
pub const INDIGO_100: &'static str = "#e0e7ff";
pub const INDIGO_200: &'static str = "#c7d2fe";
pub const INDIGO_300: &'static str = "#a5b4fc";
pub const INDIGO_400: &'static str = "#818cf8";
pub const INDIGO_500: &'static str = "#6366f1";
pub const INDIGO_600: &'static str = "#4f46e5";
pub const INDIGO_700: &'static str = "#4338ca";
pub const INDIGO_800: &'static str = "#3730a3";
pub const INDIGO_900: &'static str = "#312e81";
pub const INDIGO_950: &'static str = "#1e1b4b";
pub const INDIGO_50: &str = "#eef2ff";
pub const INDIGO_100: &str = "#e0e7ff";
pub const INDIGO_200: &str = "#c7d2fe";
pub const INDIGO_300: &str = "#a5b4fc";
pub const INDIGO_400: &str = "#818cf8";
pub const INDIGO_500: &str = "#6366f1";
pub const INDIGO_600: &str = "#4f46e5";
pub const INDIGO_700: &str = "#4338ca";
pub const INDIGO_800: &str = "#3730a3";
pub const INDIGO_900: &str = "#312e81";
pub const INDIGO_950: &str = "#1e1b4b";
pub const VIOLET_50: &'static str = "#f5f3ff";
pub const VIOLET_100: &'static str = "#ede9fe";
pub const VIOLET_200: &'static str = "#ddd6fe";
pub const VIOLET_300: &'static str = "#c4b5fd";
pub const VIOLET_400: &'static str = "#a78bfa";
pub const VIOLET_500: &'static str = "#8b5cf6";
pub const VIOLET_600: &'static str = "#7c3aed";
pub const VIOLET_700: &'static str = "#6d28d9";
pub const VIOLET_800: &'static str = "#5b21b6";
pub const VIOLET_900: &'static str = "#4c1d95";
pub const VIOLET_950: &'static str = "#2e1065";
pub const VIOLET_50: &str = "#f5f3ff";
pub const VIOLET_100: &str = "#ede9fe";
pub const VIOLET_200: &str = "#ddd6fe";
pub const VIOLET_300: &str = "#c4b5fd";
pub const VIOLET_400: &str = "#a78bfa";
pub const VIOLET_500: &str = "#8b5cf6";
pub const VIOLET_600: &str = "#7c3aed";
pub const VIOLET_700: &str = "#6d28d9";
pub const VIOLET_800: &str = "#5b21b6";
pub const VIOLET_900: &str = "#4c1d95";
pub const VIOLET_950: &str = "#2e1065";
pub const PURPLE_50: &'static str = "#faf5ff";
pub const PURPLE_100: &'static str = "#f3e8ff";
pub const PURPLE_200: &'static str = "#e9d5ff";
pub const PURPLE_300: &'static str = "#d8b4fe";
pub const PURPLE_400: &'static str = "#c084fc";
pub const PURPLE_500: &'static str = "#a855f7";
pub const PURPLE_600: &'static str = "#9333ea";
pub const PURPLE_700: &'static str = "#7e22ce";
pub const PURPLE_800: &'static str = "#6b21a8";
pub const PURPLE_900: &'static str = "#581c87";
pub const PURPLE_950: &'static str = "#3b0764";
pub const PURPLE_50: &str = "#faf5ff";
pub const PURPLE_100: &str = "#f3e8ff";
pub const PURPLE_200: &str = "#e9d5ff";
pub const PURPLE_300: &str = "#d8b4fe";
pub const PURPLE_400: &str = "#c084fc";
pub const PURPLE_500: &str = "#a855f7";
pub const PURPLE_600: &str = "#9333ea";
pub const PURPLE_700: &str = "#7e22ce";
pub const PURPLE_800: &str = "#6b21a8";
pub const PURPLE_900: &str = "#581c87";
pub const PURPLE_950: &str = "#3b0764";
pub const FUCHSIA_50: &'static str = "#fdf4ff";
pub const FUCHSIA_100: &'static str = "#fae8ff";
pub const FUCHSIA_200: &'static str = "#f5d0fe";
pub const FUCHSIA_300: &'static str = "#f0abfc";
pub const FUCHSIA_400: &'static str = "#e879f9";
pub const FUCHSIA_500: &'static str = "#d946ef";
pub const FUCHSIA_600: &'static str = "#c026d3";
pub const FUCHSIA_700: &'static str = "#a21caf";
pub const FUCHSIA_800: &'static str = "#86198f";
pub const FUCHSIA_900: &'static str = "#701a75";
pub const FUCHSIA_950: &'static str = "#4a044e";
pub const FUCHSIA_50: &str = "#fdf4ff";
pub const FUCHSIA_100: &str = "#fae8ff";
pub const FUCHSIA_200: &str = "#f5d0fe";
pub const FUCHSIA_300: &str = "#f0abfc";
pub const FUCHSIA_400: &str = "#e879f9";
pub const FUCHSIA_500: &str = "#d946ef";
pub const FUCHSIA_600: &str = "#c026d3";
pub const FUCHSIA_700: &str = "#a21caf";
pub const FUCHSIA_800: &str = "#86198f";
pub const FUCHSIA_900: &str = "#701a75";
pub const FUCHSIA_950: &str = "#4a044e";
pub const PINK_50: &'static str = "#fdf2f8";
pub const PINK_100: &'static str = "#fce7f3";
pub const PINK_200: &'static str = "#fbcfe8";
pub const PINK_300: &'static str = "#f9a8d4";
pub const PINK_400: &'static str = "#f472b6";
pub const PINK_500: &'static str = "#ec4899";
pub const PINK_600: &'static str = "#db2777";
pub const PINK_700: &'static str = "#be185d";
pub const PINK_800: &'static str = "#9d174d";
pub const PINK_900: &'static str = "#831843";
pub const PINK_950: &'static str = "#500724";
pub const PINK_50: &str = "#fdf2f8";
pub const PINK_100: &str = "#fce7f3";
pub const PINK_200: &str = "#fbcfe8";
pub const PINK_300: &str = "#f9a8d4";
pub const PINK_400: &str = "#f472b6";
pub const PINK_500: &str = "#ec4899";
pub const PINK_600: &str = "#db2777";
pub const PINK_700: &str = "#be185d";
pub const PINK_800: &str = "#9d174d";
pub const PINK_900: &str = "#831843";
pub const PINK_950: &str = "#500724";
pub const ROSE_50: &'static str = "#fff1f2";
pub const ROSE_100: &'static str = "#ffe4e6";
pub const ROSE_200: &'static str = "#fecdd3";
pub const ROSE_300: &'static str = "#fda4af";
pub const ROSE_400: &'static str = "#fb7185";
pub const ROSE_500: &'static str = "#f43f5e";
pub const ROSE_600: &'static str = "#e11d48";
pub const ROSE_700: &'static str = "#be123c";
pub const ROSE_800: &'static str = "#9f1239";
pub const ROSE_900: &'static str = "#881337";
pub const ROSE_950: &'static str = "#4c0519";
pub const ROSE_50: &str = "#fff1f2";
pub const ROSE_100: &str = "#ffe4e6";
pub const ROSE_200: &str = "#fecdd3";
pub const ROSE_300: &str = "#fda4af";
pub const ROSE_400: &str = "#fb7185";
pub const ROSE_500: &str = "#f43f5e";
pub const ROSE_600: &str = "#e11d48";
pub const ROSE_700: &str = "#be123c";
pub const ROSE_800: &str = "#9f1239";
pub const ROSE_900: &str = "#881337";
pub const ROSE_950: &str = "#4c0519";

View File

@ -18,6 +18,7 @@ use std::any::TypeId;
#[derive(Default)]
pub(crate) struct EcsSubscriptions {
pub resources: Box<HashMap<ComponentId, HashSet<ScopeId>>>,
#[allow(clippy::type_complexity)]
pub events: Box<HashMap<TypeId, (Box<dyn Fn(&World) -> bool>, HashSet<ScopeId>)>>,
pub world_and_queries: Box<HashSet<ScopeId>>,
}
@ -28,6 +29,7 @@ pub(crate) struct EcsContext {
}
impl EcsContext {
#[allow(clippy::mut_from_ref)]
pub fn get_world(cx: &ScopeState) -> &mut World {
unsafe {
&mut *cx
@ -38,7 +40,7 @@ impl EcsContext {
}
}
pub fn use_world<'a>(cx: &'a ScopeState) -> &'a World {
pub fn use_world(cx: &ScopeState) -> &World {
let world = EcsContext::get_world(cx);
let scope_id = cx.scope_id();
@ -57,7 +59,7 @@ pub fn use_world<'a>(cx: &'a ScopeState) -> &'a World {
world
}
pub fn use_resource<'a, T: Resource>(cx: &'a ScopeState) -> &'a T {
pub fn use_resource<T: Resource>(cx: &ScopeState) -> &T {
let world = EcsContext::get_world(cx);
let resource_id = world.components().resource_id::<T>().unwrap();
@ -85,14 +87,14 @@ pub fn use_resource<'a, T: Resource>(cx: &'a ScopeState) -> &'a T {
world.resource()
}
pub fn use_query<'a, Q>(cx: &'a ScopeState) -> UseQuery<'a, Q, ()>
pub fn use_query<Q>(cx: &ScopeState) -> UseQuery<'_, Q, ()>
where
Q: ReadOnlyWorldQuery,
{
use_query_filtered(cx)
}
pub fn use_query_filtered<'a, Q, F>(cx: &'a ScopeState) -> UseQuery<'a, Q, F>
pub fn use_query_filtered<Q, F>(cx: &ScopeState) -> UseQuery<'_, Q, F>
where
Q: ReadOnlyWorldQuery,
F: ReadOnlyWorldQuery,
@ -118,10 +120,10 @@ where
}
}
pub fn use_event_reader<'a, E: Event>(cx: &'a ScopeState) -> EventIterator<'a, E> {
pub fn use_event_reader<E: Event>(cx: &ScopeState) -> EventIterator<'_, E> {
// TODO: Register the subscription
let event_reader = cx.use_hook(|| ManualEventReader::default());
let event_reader = cx.use_hook(ManualEventReader::default);
let events = EcsContext::get_world(cx).resource::<Events<E>>();
event_reader.read(events)
}

View File

@ -47,6 +47,7 @@ pub struct EventReaders {
}
impl EventReaders {
#[allow(clippy::too_many_arguments)]
pub fn read_events(
&mut self,
click: &Events<Pointer<Click>>,
@ -238,4 +239,4 @@ macro_rules! impl_event {
};
}
pub(self) use impl_event;
use impl_event;

View File

@ -8,6 +8,7 @@ use bevy::{
};
use std::f32::consts::PI;
#[allow(clippy::too_many_arguments)]
pub fn set_attribute(
name: &str,
value: &str,
@ -172,7 +173,7 @@ pub fn set_attribute(
("visibility", "inherited") => *visibility = Visibility::Inherited,
("visibility", "hidden") => *visibility = Visibility::Hidden,
("visibility", "visible") => *visibility = Visibility::Visible,
("z_index", value) => match value.split_once(":") {
("z_index", value) => match value.split_once(':') {
Some(("local", value)) => *z_index = ZIndex::Local(parse_i32(value)),
Some(("global", value)) => *z_index = ZIndex::Global(parse_i32(value)),
None => *z_index = ZIndex::Local(parse_i32(value)),
@ -209,9 +210,7 @@ pub fn set_attribute(
}
fn parse_color(hex: &str) -> Color {
Color::hex(hex).expect(&format!(
"Encountered invalid bevy_dioxus Color hex `{hex}`."
))
Color::hex(hex).unwrap_or_else(|_| panic!("Encountered invalid bevy_dioxus Color hex `{hex}`."))
}
fn parse_f32(float: &str) -> f32 {

View File

@ -58,7 +58,7 @@ pub fn tick_dioxus_ui(world: &mut World) {
fn run_deferred_systems(world: &mut World) {
for mut system in mem::take(&mut *world.resource_mut::<DeferredSystemRunQueue>().run_queue) {
system.initialize(world);
let _ = system.run((), world);
system.run((), world);
}
}