From 3a84da69517384d8f400ea261075658904e2384b Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Sat, 7 Jun 2025 13:07:12 +0900 Subject: [PATCH] Move winit itself to crate That way we use top-level Cargo.toml only for the workspace management purposes. --- .github/workflows/ci.yml | 5 +- CHANGELOG.md | 2 +- Cargo.toml | 134 +----------------- winit-android/LICENSE | 1 + winit-appkit/LICENSE | 1 + winit-common/LICENSE | 1 + winit-orbital/LICENSE | 1 + winit-uikit/LICENSE | 1 + winit-wayland/LICENSE | 1 + winit-web/LICENSE | 1 + winit-win32/LICENSE | 1 + winit-x11/LICENSE | 1 + winit/Cargo.toml | 119 ++++++++++++++++ winit/FEATURES.md | 1 + winit/LICENSE | 1 + winit/README.md | 1 + build.rs => winit/build.rs | 0 winit/docs | 1 + winit/examples | 1 + {src => winit/src}/changelog/mod.rs | 0 {src => winit/src}/changelog/unreleased.md | 0 {src => winit/src}/changelog/v0.10.md | 0 {src => winit/src}/changelog/v0.11.md | 0 {src => winit/src}/changelog/v0.12.md | 0 {src => winit/src}/changelog/v0.13.md | 0 {src => winit/src}/changelog/v0.14.md | 0 {src => winit/src}/changelog/v0.15.md | 0 {src => winit/src}/changelog/v0.16.md | 0 {src => winit/src}/changelog/v0.17.md | 0 {src => winit/src}/changelog/v0.18.md | 0 {src => winit/src}/changelog/v0.19.md | 0 {src => winit/src}/changelog/v0.20.md | 0 {src => winit/src}/changelog/v0.21.md | 0 {src => winit/src}/changelog/v0.22.md | 0 {src => winit/src}/changelog/v0.23.md | 0 {src => winit/src}/changelog/v0.24.md | 0 {src => winit/src}/changelog/v0.25.md | 0 {src => winit/src}/changelog/v0.26.md | 0 {src => winit/src}/changelog/v0.27.md | 0 {src => winit/src}/changelog/v0.28.md | 0 {src => winit/src}/changelog/v0.29.md | 0 {src => winit/src}/changelog/v0.30.md | 0 {src => winit/src}/changelog/v0.8.md | 0 {src => winit/src}/changelog/v0.9.md | 0 {src => winit/src}/event_loop.rs | 0 {src => winit/src}/lib.rs | 0 {src => winit/src}/os_error.rs | 0 {src => winit/src}/platform/mod.rs | 0 {src => winit/src}/platform/scancode.rs | 0 {src => winit/src}/platform/startup_notify.rs | 0 .../src}/platform_impl/apple/appkit/mod.rs | 0 {src => winit/src}/platform_impl/linux/mod.rs | 0 {src => winit/src}/platform_impl/mod.rs | 0 {tests => winit/tests}/send_objects.rs | 0 {tests => winit/tests}/serde_objects.rs | 0 {tests => winit/tests}/sync_object.rs | 0 56 files changed, 140 insertions(+), 134 deletions(-) create mode 120000 winit-android/LICENSE create mode 120000 winit-appkit/LICENSE create mode 120000 winit-common/LICENSE create mode 120000 winit-orbital/LICENSE create mode 120000 winit-uikit/LICENSE create mode 120000 winit-wayland/LICENSE create mode 120000 winit-web/LICENSE create mode 120000 winit-win32/LICENSE create mode 120000 winit-x11/LICENSE create mode 100644 winit/Cargo.toml create mode 120000 winit/FEATURES.md create mode 120000 winit/LICENSE create mode 120000 winit/README.md rename build.rs => winit/build.rs (100%) create mode 120000 winit/docs create mode 120000 winit/examples rename {src => winit/src}/changelog/mod.rs (100%) rename {src => winit/src}/changelog/unreleased.md (100%) rename {src => winit/src}/changelog/v0.10.md (100%) rename {src => winit/src}/changelog/v0.11.md (100%) rename {src => winit/src}/changelog/v0.12.md (100%) rename {src => winit/src}/changelog/v0.13.md (100%) rename {src => winit/src}/changelog/v0.14.md (100%) rename {src => winit/src}/changelog/v0.15.md (100%) rename {src => winit/src}/changelog/v0.16.md (100%) rename {src => winit/src}/changelog/v0.17.md (100%) rename {src => winit/src}/changelog/v0.18.md (100%) rename {src => winit/src}/changelog/v0.19.md (100%) rename {src => winit/src}/changelog/v0.20.md (100%) rename {src => winit/src}/changelog/v0.21.md (100%) rename {src => winit/src}/changelog/v0.22.md (100%) rename {src => winit/src}/changelog/v0.23.md (100%) rename {src => winit/src}/changelog/v0.24.md (100%) rename {src => winit/src}/changelog/v0.25.md (100%) rename {src => winit/src}/changelog/v0.26.md (100%) rename {src => winit/src}/changelog/v0.27.md (100%) rename {src => winit/src}/changelog/v0.28.md (100%) rename {src => winit/src}/changelog/v0.29.md (100%) rename {src => winit/src}/changelog/v0.30.md (100%) rename {src => winit/src}/changelog/v0.8.md (100%) rename {src => winit/src}/changelog/v0.9.md (100%) rename {src => winit/src}/event_loop.rs (100%) rename {src => winit/src}/lib.rs (100%) rename {src => winit/src}/os_error.rs (100%) rename {src => winit/src}/platform/mod.rs (100%) rename {src => winit/src}/platform/scancode.rs (100%) rename {src => winit/src}/platform/startup_notify.rs (100%) rename {src => winit/src}/platform_impl/apple/appkit/mod.rs (100%) rename {src => winit/src}/platform_impl/linux/mod.rs (100%) rename {src => winit/src}/platform_impl/mod.rs (100%) rename {tests => winit/tests}/send_objects.rs (100%) rename {tests => winit/tests}/serde_objects.rs (100%) rename {tests => winit/tests}/sync_object.rs (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b0bb580..342f1013 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - { name: 'Linux 64bit', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, } - { name: 'X11', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=x11' } - { name: 'Wayland', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' } - - { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } + - { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' } - { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest, } - { name: 'macOS x86_64', target: x86_64-apple-darwin, os: macos-latest, } - { name: 'macOS Aarch64', target: aarch64-apple-darwin, os: macos-latest, } @@ -89,7 +89,7 @@ jobs: platform: { name: 'Redox OS' } include: - toolchain: '1.80' - platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } + platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' } - toolchain: 'nightly' platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile } - toolchain: 'nightly' @@ -313,6 +313,7 @@ jobs: with: command: check log-level: error + manifest-path: winit/Cargo.toml arguments: --all-features --target ${{ matrix.platform.target }} eslint: diff --git a/CHANGELOG.md b/CHANGELOG.md index b83c5614..fe26b985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,6 @@ Changelog entries should be put in the [`changelog::unreleased`]. The changelog can also be viewed [on docs.rs][docs_rs] or [on the current master docs][master_docs]. -[`changelog::unreleased`]: src/changelog/unreleased.md +[`changelog::unreleased`]: winit/src/changelog/unreleased.md [docs_rs]: https://docs.rs/winit/latest/winit/changelog/index.html [master_docs]: https://rust-windowing.github.io/winit/winit/changelog/index.html diff --git a/Cargo.toml b/Cargo.toml index 5f2b9aa4..0ccbaadd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] -members = ["dpi", "winit-*"] +default-members = ["winit"] +members = ["dpi", "winit*"] resolver = "2" [workspace.package] @@ -11,7 +12,7 @@ rust-version = "1.80" [workspace.dependencies] # Workspace dependencies. # `winit` has no version here to allow using it in dev deps for docs. -winit = { path = "." } +winit = { path = "winit" } winit-android = { version = "0.0.0", path = "winit-android" } winit-appkit = { version = "0.0.0", path = "winit-appkit" } winit-common = { version = "0.0.0", path = "winit-common" } @@ -99,132 +100,3 @@ wasm-bindgen-futures = "0.4.43" wasm-bindgen-test = "0.3" web-time = "1" web_sys = { package = "web-sys", version = "0.3.70" } - -## -## Top-level Winit crate. -## -[package] -authors = ["The winit contributors", "Pierre Krieger "] -categories = ["gui"] -description = "Cross-platform window creation library." -documentation = "https://docs.rs/winit" -edition.workspace = true -include = ["/build.rs", "/docs", "/examples", "/FEATURES.md", "/LICENSE", "/src", "/tests"] -keywords = ["windowing"] -license.workspace = true -name = "winit" -readme = "README.md" -repository.workspace = true -rust-version.workspace = true -version = "0.30.11" - -[package.metadata.docs.rs] -features = [ - "serde", - "mint", - # Enabled to get docs to compile - "android-native-activity", -] -# These are all tested in CI -rustdoc-args = ["--cfg", "docsrs"] -targets = [ - # Windows - "i686-pc-windows-msvc", - "x86_64-pc-windows-msvc", - # macOS - "aarch64-apple-darwin", - "x86_64-apple-darwin", - # Unix (X11 & Wayland) - "i686-unknown-linux-gnu", - "x86_64-unknown-linux-gnu", - # iOS - "aarch64-apple-ios", - # Android - "aarch64-linux-android", - # Web - "wasm32-unknown-unknown", -] - -# Features are documented in either `lib.rs` or under `winit::platform`. -[features] -default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"] - -android-game-activity = ["winit-android/game-activity"] -android-native-activity = ["winit-android/native-activity"] -mint = ["dpi/mint"] -serde = [ - "dep:serde", - "cursor-icon/serde", - "smol_str/serde", - "dpi/serde", - "bitflags/serde", - "winit-core/serde", - "winit-uikit/serde", -] -wayland = ["winit-wayland"] -wayland-csd-adwaita = ["winit-wayland/csd-adwaita"] -wayland-csd-adwaita-crossfont = ["winit-wayland/csd-adwaita-crossfont"] -wayland-csd-adwaita-notitle = ["winit-wayland/csd-adwaita-notitle"] -wayland-dlopen = ["winit-wayland/dlopen"] -x11 = ["dep:winit-x11"] - -[build-dependencies] -cfg_aliases.workspace = true - -[dependencies] -bitflags.workspace = true -cursor-icon.workspace = true -dpi.workspace = true -rwh_06.workspace = true -serde = { workspace = true, optional = true } -smol_str.workspace = true -tracing.workspace = true -winit-core.workspace = true - -[dev-dependencies] -image = { workspace = true, features = ["png"] } -tracing = { workspace = true, features = ["log"] } -tracing-subscriber = { workspace = true, features = ["env-filter"] } - -[target.'cfg(not(target_os = "android"))'.dev-dependencies] -softbuffer.workspace = true - -[target.'cfg(target_os = "android")'.dependencies] -winit-android.workspace = true - -[target.'cfg(target_os = "macos")'.dependencies] -winit-appkit.workspace = true - -[target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies] -winit-uikit.workspace = true - -[target.'cfg(target_os = "windows")'.dependencies] -winit-win32.workspace = true - -# Linux -[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies] -libc.workspace = true -rustix = { workspace = true, features = ["std", "thread"] } -winit-common = { workspace = true, features = ["xkb"] } -winit-wayland = { workspace = true, optional = true, default-features = false } -winit-x11 = { workspace = true, optional = true } - -[target.'cfg(target_os = "redox")'.dependencies] -winit-orbital.workspace = true - -[target.'cfg(target_family = "wasm")'.dependencies] -winit-web.workspace = true - -[target.'cfg(target_family = "wasm")'.dev-dependencies] -console_error_panic_hook.workspace = true -tracing-web.workspace = true -wasm-bindgen-futures.workspace = true -wasm-bindgen-test.workspace = true -web-time.workspace = true - -[[example]] -doc-scrape-examples = true -name = "window" - -[[example]] -name = "child_window" diff --git a/winit-android/LICENSE b/winit-android/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-android/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-appkit/LICENSE b/winit-appkit/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-appkit/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-common/LICENSE b/winit-common/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-common/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-orbital/LICENSE b/winit-orbital/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-orbital/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-uikit/LICENSE b/winit-uikit/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-uikit/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-wayland/LICENSE b/winit-wayland/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-wayland/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-web/LICENSE b/winit-web/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-web/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-win32/LICENSE b/winit-win32/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-win32/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit-x11/LICENSE b/winit-x11/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit-x11/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit/Cargo.toml b/winit/Cargo.toml new file mode 100644 index 00000000..5bbe2d7f --- /dev/null +++ b/winit/Cargo.toml @@ -0,0 +1,119 @@ +[package] +categories = ["gui"] +description = "Cross-platform window creation library." +documentation = "https://docs.rs/winit" +edition.workspace = true +keywords = ["windowing"] +license.workspace = true +name = "winit" +repository.workspace = true +rust-version.workspace = true +version = "0.30.11" + +[package.metadata.docs.rs] +features = [ + "serde", + "mint", + # Enabled to get docs to compile + "android-native-activity", +] +# These are all tested in CI +rustdoc-args = ["--cfg", "docsrs"] +targets = [ + # Windows + "i686-pc-windows-msvc", + "x86_64-pc-windows-msvc", + # macOS + "aarch64-apple-darwin", + "x86_64-apple-darwin", + # Unix (X11 & Wayland) + "i686-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", + # iOS + "aarch64-apple-ios", + # Android + "aarch64-linux-android", + # Web + "wasm32-unknown-unknown", +] + +# Features are documented in either `lib.rs` or under `winit::platform`. +[features] +default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"] + +android-game-activity = ["winit-android/game-activity"] +android-native-activity = ["winit-android/native-activity"] +mint = ["dpi/mint"] +serde = [ + "dep:serde", + "cursor-icon/serde", + "smol_str/serde", + "dpi/serde", + "bitflags/serde", + "winit-core/serde", + "winit-uikit/serde", +] +wayland = ["winit-wayland"] +wayland-csd-adwaita = ["winit-wayland/csd-adwaita"] +wayland-csd-adwaita-crossfont = ["winit-wayland/csd-adwaita-crossfont"] +wayland-csd-adwaita-notitle = ["winit-wayland/csd-adwaita-notitle"] +wayland-dlopen = ["winit-wayland/dlopen"] +x11 = ["dep:winit-x11"] + +[build-dependencies] +cfg_aliases.workspace = true + +[dependencies] +bitflags.workspace = true +cursor-icon.workspace = true +dpi.workspace = true +rwh_06.workspace = true +serde = { workspace = true, optional = true } +smol_str.workspace = true +tracing.workspace = true +winit-core.workspace = true + +[dev-dependencies] +image = { workspace = true, features = ["png"] } +tracing = { workspace = true, features = ["log"] } +tracing-subscriber = { workspace = true, features = ["env-filter"] } + +[target.'cfg(not(target_os = "android"))'.dev-dependencies] +softbuffer.workspace = true + +[target.'cfg(target_os = "android")'.dependencies] +winit-android.workspace = true + +[target.'cfg(target_os = "macos")'.dependencies] +winit-appkit.workspace = true + +[target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies] +winit-uikit.workspace = true + +[target.'cfg(target_os = "windows")'.dependencies] +winit-win32.workspace = true + +# Linux +[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies] +libc.workspace = true +rustix = { workspace = true, features = ["std", "thread"] } +winit-common = { workspace = true, features = ["xkb"] } +winit-wayland = { workspace = true, optional = true, default-features = false } +winit-x11 = { workspace = true, optional = true } + +[target.'cfg(target_os = "redox")'.dependencies] +winit-orbital.workspace = true + +[target.'cfg(target_family = "wasm")'.dependencies] +winit-web.workspace = true + +[target.'cfg(target_family = "wasm")'.dev-dependencies] +console_error_panic_hook.workspace = true +tracing-web.workspace = true +wasm-bindgen-futures.workspace = true +wasm-bindgen-test.workspace = true +web-time.workspace = true + +[[example]] +doc-scrape-examples = true +name = "window" diff --git a/winit/FEATURES.md b/winit/FEATURES.md new file mode 120000 index 00000000..e76a024e --- /dev/null +++ b/winit/FEATURES.md @@ -0,0 +1 @@ +../FEATURES.md \ No newline at end of file diff --git a/winit/LICENSE b/winit/LICENSE new file mode 120000 index 00000000..ea5b6064 --- /dev/null +++ b/winit/LICENSE @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file diff --git a/winit/README.md b/winit/README.md new file mode 120000 index 00000000..32d46ee8 --- /dev/null +++ b/winit/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/build.rs b/winit/build.rs similarity index 100% rename from build.rs rename to winit/build.rs diff --git a/winit/docs b/winit/docs new file mode 120000 index 00000000..a9594bfe --- /dev/null +++ b/winit/docs @@ -0,0 +1 @@ +../docs \ No newline at end of file diff --git a/winit/examples b/winit/examples new file mode 120000 index 00000000..a6573af9 --- /dev/null +++ b/winit/examples @@ -0,0 +1 @@ +../examples \ No newline at end of file diff --git a/src/changelog/mod.rs b/winit/src/changelog/mod.rs similarity index 100% rename from src/changelog/mod.rs rename to winit/src/changelog/mod.rs diff --git a/src/changelog/unreleased.md b/winit/src/changelog/unreleased.md similarity index 100% rename from src/changelog/unreleased.md rename to winit/src/changelog/unreleased.md diff --git a/src/changelog/v0.10.md b/winit/src/changelog/v0.10.md similarity index 100% rename from src/changelog/v0.10.md rename to winit/src/changelog/v0.10.md diff --git a/src/changelog/v0.11.md b/winit/src/changelog/v0.11.md similarity index 100% rename from src/changelog/v0.11.md rename to winit/src/changelog/v0.11.md diff --git a/src/changelog/v0.12.md b/winit/src/changelog/v0.12.md similarity index 100% rename from src/changelog/v0.12.md rename to winit/src/changelog/v0.12.md diff --git a/src/changelog/v0.13.md b/winit/src/changelog/v0.13.md similarity index 100% rename from src/changelog/v0.13.md rename to winit/src/changelog/v0.13.md diff --git a/src/changelog/v0.14.md b/winit/src/changelog/v0.14.md similarity index 100% rename from src/changelog/v0.14.md rename to winit/src/changelog/v0.14.md diff --git a/src/changelog/v0.15.md b/winit/src/changelog/v0.15.md similarity index 100% rename from src/changelog/v0.15.md rename to winit/src/changelog/v0.15.md diff --git a/src/changelog/v0.16.md b/winit/src/changelog/v0.16.md similarity index 100% rename from src/changelog/v0.16.md rename to winit/src/changelog/v0.16.md diff --git a/src/changelog/v0.17.md b/winit/src/changelog/v0.17.md similarity index 100% rename from src/changelog/v0.17.md rename to winit/src/changelog/v0.17.md diff --git a/src/changelog/v0.18.md b/winit/src/changelog/v0.18.md similarity index 100% rename from src/changelog/v0.18.md rename to winit/src/changelog/v0.18.md diff --git a/src/changelog/v0.19.md b/winit/src/changelog/v0.19.md similarity index 100% rename from src/changelog/v0.19.md rename to winit/src/changelog/v0.19.md diff --git a/src/changelog/v0.20.md b/winit/src/changelog/v0.20.md similarity index 100% rename from src/changelog/v0.20.md rename to winit/src/changelog/v0.20.md diff --git a/src/changelog/v0.21.md b/winit/src/changelog/v0.21.md similarity index 100% rename from src/changelog/v0.21.md rename to winit/src/changelog/v0.21.md diff --git a/src/changelog/v0.22.md b/winit/src/changelog/v0.22.md similarity index 100% rename from src/changelog/v0.22.md rename to winit/src/changelog/v0.22.md diff --git a/src/changelog/v0.23.md b/winit/src/changelog/v0.23.md similarity index 100% rename from src/changelog/v0.23.md rename to winit/src/changelog/v0.23.md diff --git a/src/changelog/v0.24.md b/winit/src/changelog/v0.24.md similarity index 100% rename from src/changelog/v0.24.md rename to winit/src/changelog/v0.24.md diff --git a/src/changelog/v0.25.md b/winit/src/changelog/v0.25.md similarity index 100% rename from src/changelog/v0.25.md rename to winit/src/changelog/v0.25.md diff --git a/src/changelog/v0.26.md b/winit/src/changelog/v0.26.md similarity index 100% rename from src/changelog/v0.26.md rename to winit/src/changelog/v0.26.md diff --git a/src/changelog/v0.27.md b/winit/src/changelog/v0.27.md similarity index 100% rename from src/changelog/v0.27.md rename to winit/src/changelog/v0.27.md diff --git a/src/changelog/v0.28.md b/winit/src/changelog/v0.28.md similarity index 100% rename from src/changelog/v0.28.md rename to winit/src/changelog/v0.28.md diff --git a/src/changelog/v0.29.md b/winit/src/changelog/v0.29.md similarity index 100% rename from src/changelog/v0.29.md rename to winit/src/changelog/v0.29.md diff --git a/src/changelog/v0.30.md b/winit/src/changelog/v0.30.md similarity index 100% rename from src/changelog/v0.30.md rename to winit/src/changelog/v0.30.md diff --git a/src/changelog/v0.8.md b/winit/src/changelog/v0.8.md similarity index 100% rename from src/changelog/v0.8.md rename to winit/src/changelog/v0.8.md diff --git a/src/changelog/v0.9.md b/winit/src/changelog/v0.9.md similarity index 100% rename from src/changelog/v0.9.md rename to winit/src/changelog/v0.9.md diff --git a/src/event_loop.rs b/winit/src/event_loop.rs similarity index 100% rename from src/event_loop.rs rename to winit/src/event_loop.rs diff --git a/src/lib.rs b/winit/src/lib.rs similarity index 100% rename from src/lib.rs rename to winit/src/lib.rs diff --git a/src/os_error.rs b/winit/src/os_error.rs similarity index 100% rename from src/os_error.rs rename to winit/src/os_error.rs diff --git a/src/platform/mod.rs b/winit/src/platform/mod.rs similarity index 100% rename from src/platform/mod.rs rename to winit/src/platform/mod.rs diff --git a/src/platform/scancode.rs b/winit/src/platform/scancode.rs similarity index 100% rename from src/platform/scancode.rs rename to winit/src/platform/scancode.rs diff --git a/src/platform/startup_notify.rs b/winit/src/platform/startup_notify.rs similarity index 100% rename from src/platform/startup_notify.rs rename to winit/src/platform/startup_notify.rs diff --git a/src/platform_impl/apple/appkit/mod.rs b/winit/src/platform_impl/apple/appkit/mod.rs similarity index 100% rename from src/platform_impl/apple/appkit/mod.rs rename to winit/src/platform_impl/apple/appkit/mod.rs diff --git a/src/platform_impl/linux/mod.rs b/winit/src/platform_impl/linux/mod.rs similarity index 100% rename from src/platform_impl/linux/mod.rs rename to winit/src/platform_impl/linux/mod.rs diff --git a/src/platform_impl/mod.rs b/winit/src/platform_impl/mod.rs similarity index 100% rename from src/platform_impl/mod.rs rename to winit/src/platform_impl/mod.rs diff --git a/tests/send_objects.rs b/winit/tests/send_objects.rs similarity index 100% rename from tests/send_objects.rs rename to winit/tests/send_objects.rs diff --git a/tests/serde_objects.rs b/winit/tests/serde_objects.rs similarity index 100% rename from tests/serde_objects.rs rename to winit/tests/serde_objects.rs diff --git a/tests/sync_object.rs b/winit/tests/sync_object.rs similarity index 100% rename from tests/sync_object.rs rename to winit/tests/sync_object.rs