Skip to content

Commit

Permalink
clippy fixes & dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
elinorbgr committed Aug 25, 2023
1 parent e081364 commit 2826c61
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 35 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
- name: Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.59.0
toolchain: 1.65.0
override: true
profile: minimal
default: true
Expand All @@ -210,18 +210,6 @@ jobs:
- name: System dependencies
run: sudo apt-get install libwayland-dev

- name: Fix raw-window-handle
uses: actions-rs/cargo@v1
with:
command: update
args: -p raw-window-handle --precise 0.5.0

- name: Fix log
uses: actions-rs/cargo@v1
with:
command: update
args: -p log --precise 0.4.17

- name: Check
uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The documentation for the releases can be found on [docs.rs](https://docs.rs/):

## Requirements

Requires at least rust 1.63.0 to be used, and version 1.15 of the wayland system libraries if using the
Requires at least rust 1.65.0 to be used, and version 1.15 of the wayland system libraries if using the
system backend.

## Chat and support
Expand Down
7 changes: 7 additions & 0 deletions wayland-backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased

#### Breaking change

- MSRV bumped to 1.65
- `io-lifetimes` is no longer a (public) dependency

#### Additions

- Add `flush` method to server `Handle`.

## 0.2.0 -- 2023-07-13
Expand Down
7 changes: 3 additions & 4 deletions wayland-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "wayland-backend"
version = "0.2.0"
authors = ["Elinor Berger <elinor@safaradeg.net>"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
repository = "https://github.com/smithay/wayland-rs"
documentation = "https://docs.rs/wayland-backend/"
license = "MIT"
Expand All @@ -18,12 +18,11 @@ wayland-sys = { version = "0.31.0", path = "../wayland-sys", features = [] }
log = { version = "0.4", optional = true }
scoped-tls = "1.0"
downcast-rs = "1.2"
io-lifetimes = "2"
raw-window-handle = { version = "0.5.0", optional = true }

[dependencies.smallvec]
version = "1.9"
# Some additional features can be enabled since wayland-rs requires at least Rust 1.59
# Some additional features can be enabled since wayland-rs requires at least Rust 1.65
features = [
"union", # 1.49
"const_generics", # 1.51
Expand All @@ -48,7 +47,7 @@ cc = "1.0"
wayland-scanner = { path = "../wayland-scanner"}
wayland-sys = { path = "../wayland-sys", features = ["client", "server"] }
concat-idents = "1.1"
env_logger = "0.9"
env_logger = "0.10"

[features]
client_system = ["wayland-sys/client"]
Expand Down
2 changes: 0 additions & 2 deletions wayland-backend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
// Doc feature labels can be tested locally by running RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc -p <crate>
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

/// Reexport of the `io_lifetimes` crate, which is part of `wayland-backend`'s public API.
pub extern crate io_lifetimes;
/// Reexport of the `smallvec` crate, which is part of `wayland-backend`'s public API.
pub extern crate smallvec;

Expand Down
2 changes: 1 addition & 1 deletion wayland-backend/src/rs/wire.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ mod tests {
#[test]
fn into_from_raw_cycle() {
let mut bytes_buffer = vec![0; 1024];
let mut fd_buffer = vec![0; 10];
let mut fd_buffer = [0; 10];

let msg = Message {
sender_id: 42,
Expand Down
2 changes: 1 addition & 1 deletion wayland-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/smithay/wayland-rs"
authors = ["Elinor Berger <elinor@safaradeg.net>"]
license = "MIT"
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
categories = ["gui", "api-bindings"]
keywords = ["wayland", "client"]
description = "Bindings to the standard C implementation of the wayland protocol, client side."
Expand Down
1 change: 0 additions & 1 deletion wayland-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ pub mod backend {
Backend, InvalidId, NoWaylandLib, ObjectData, ObjectId, ReadEventsGuard, WaylandError,
WeakBackend,
};
pub use wayland_backend::io_lifetimes;
pub use wayland_backend::protocol;
pub use wayland_backend::smallvec;
}
Expand Down
2 changes: 1 addition & 1 deletion wayland-cursor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/smithay/wayland-rs"
authors = ["Elinor Berger <elinor@safaradeg.net>"]
license = "MIT"
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
categories = ["gui", "api-bindings"]
keywords = ["wayland", "client"]
description = "Bindings to libwayland-cursor."
Expand Down
2 changes: 1 addition & 1 deletion wayland-egl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/smithay/wayland-rs"
authors = ["Elinor Berger <elinor@safaradeg.net>"]
license = "MIT"
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
categories = ["gui", "api-bindings"]
keywords = ["wayland", "client"]
description = "Bindings to libwayland-egl."
Expand Down
2 changes: 1 addition & 1 deletion wayland-protocols-misc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["wayland", "client", "server", "protocol", "extension"]
description = "Generated API for misc and deprecated wayland protocol extensions"
categories = ["gui", "api-bindings"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion wayland-protocols-plasma/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["wayland", "client", "server", "protocol", "extension"]
description = "Generated API for the Plasma wayland protocol extensions"
categories = ["gui", "api-bindings"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion wayland-protocols-wlr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["wayland", "client", "server", "protocol", "extension"]
description = "Generated API for the WLR wayland protocol extensions"
categories = ["gui", "api-bindings"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion wayland-protocols/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["wayland", "client", "server", "protocol", "extension"]
description = "Generated API for the officials wayland protocol extensions"
categories = ["gui", "api-bindings"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions wayland-scanner/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#### Breaking changes

- Bump bitflags to 2.0
- Remove `io-lifetimes` from the generated code following wayland-backend 0.3 dropping it.

# 0.30.1 -- 2023-06-17

Expand Down
4 changes: 2 additions & 2 deletions wayland-scanner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
categories = ["gui", "api-bindings"]
keywords = ["wayland", "codegen"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

[lib]
Expand All @@ -18,7 +18,7 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.11"
quote = "1.0"
quick-xml = "0.28"
quick-xml = "0.30"

[dev-dependencies]
similar = "2"
Expand Down
2 changes: 1 addition & 1 deletion wayland-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ categories = ["gui", "api-bindings"]
keywords = ["wayland", "server", "compositor"]
description = "Bindings to the standard C implementation of the wayland protocol, server side."
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

[dependencies]
Expand Down
1 change: 0 additions & 1 deletion wayland-server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ pub use socket::{BindError, ListeningSocket};

/// Backend reexports
pub mod backend {
pub use wayland_backend::io_lifetimes;
pub use wayland_backend::protocol;
pub use wayland_backend::server::{
Backend, ClientData, ClientId, Credentials, DisconnectReason, GlobalHandler, GlobalId,
Expand Down
2 changes: 1 addition & 1 deletion wayland-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "FFI bindings to the various libwayland-*.so libraries. You should
license = "MIT"
categories = ["external-ffi-bindings"]
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
readme = "README.md"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion wayland-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "wayland-tests"
version = "0.1.0"
edition = "2018"
rust-version = "1.59"
rust-version = "1.65"
publish = false
autotests = false

Expand Down

0 comments on commit 2826c61

Please sign in to comment.