From 541aab575594ff007c51c781e79c0dedc2ab73a0 Mon Sep 17 00:00:00 2001 From: Seaotatop Date: Sun, 25 Jun 2023 19:12:48 -0500 Subject: [PATCH] Move tag file --- .github/workflows/rust.yml | 21 +++++++++++---------- src/main.rs | 1 - src/window.rs | 1 + src/{ => window}/tag.rs | 0 src/window/window_state.rs | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) rename src/{ => window}/tag.rs (100%) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ae4b08a..ac3df8f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,23 +2,24 @@ name: Rust on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] + branches: ["main"] env: CARGO_TERM_COLOR: always jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Get dependencies - run: sudo apt install libwayland-dev libxkbcommon-dev libudev-dev libinput-dev libgbm-dev libseat-dev libsystemd-dev - - name: Build - run: cargo build --verbose - - name: Run tests - run: cargo test --verbose + - uses: actions/checkout@v3 + - name: Get dependencies + run: sudo apt install libwayland-dev libxkbcommon-dev libudev-dev libinput-dev libgbm-dev libseat-dev libsystemd-dev + - name: Build + run: cargo build --verbose + - name: Run tests + run: cargo test --verbose + - name: Celebratory yahoo + run: echo yahoo diff --git a/src/main.rs b/src/main.rs index b2185ac..b5ce81d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,7 +25,6 @@ mod layout; mod pointer; mod render; mod state; -mod tag; mod window; mod xdg; diff --git a/src/window.rs b/src/window.rs index b0850c2..d8f761d 100644 --- a/src/window.rs +++ b/src/window.rs @@ -18,6 +18,7 @@ use crate::{ use self::window_state::{Float, WindowState}; +pub mod tag; pub mod window_state; pub trait SurfaceState: Default + 'static { diff --git a/src/tag.rs b/src/window/tag.rs similarity index 100% rename from src/tag.rs rename to src/window/tag.rs diff --git a/src/window/window_state.rs b/src/window/window_state.rs index dc7a101..bf0f700 100644 --- a/src/window/window_state.rs +++ b/src/window/window_state.rs @@ -11,7 +11,7 @@ use smithay::{ utils::{Logical, Point, Serial, Size}, }; -use crate::tag::Tag; +use super::tag::Tag; pub struct WindowState { /// Whether the window is floating or tiled.