Skip to content

Commit a08ea03

Browse files
authored
Remove prefixes from platform extensions traits (PlatformApplicationExt -> ApplicationExt) (#1873)
* Rename LinuxApplicationExt to linux::ApplicatonExt * Rename MacApplicationExt to mac::ApplicationExt * Update CHANGELOG
1 parent 399c454 commit a08ea03

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ You can find its changes [documented below](#070---2021-01-01).
6969
- Change the signature of `add_idle_callback` ([#1787] by [@jneem])
7070
- Move macOS only function to Mac extension trait ([#1863] by [@Maan2003])
7171
- x11: Only query atoms once instead of per window ([#1865] by [@psychon])
72+
- remove prefix from platform extension traits ([#1873] by [@Maan2003])
7273

7374
### Deprecated
7475

@@ -759,6 +760,7 @@ Last release without a changelog :(
759760
[#1866]: https://github.com/linebender/druid/pull/1866
760761
[#1867]: https://github.com/linebender/druid/pull/1867
761762
[#1868]: https://github.com/linebender/druid/pull/1868
763+
[#1873]: https://github.com/linebender/druid/pull/1873
762764

763765
[Unreleased]: https://github.com/linebender/druid/compare/v0.7.0...master
764766
[0.7.0]: https://github.com/linebender/druid/compare/v0.6.0...v0.7.0

druid-shell/src/backend/gtk/application.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl Application {
8888
}
8989
}
9090

91-
impl crate::platform::linux::LinuxApplicationExt for crate::Application {
91+
impl crate::platform::linux::ApplicationExt for crate::Application {
9292
fn primary_clipboard(&self) -> crate::Clipboard {
9393
crate::Clipboard(Clipboard {
9494
selection: gdk::SELECTION_PRIMARY,

druid-shell/src/backend/mac/application.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl Application {
119119
}
120120
}
121121

122-
impl crate::platform::mac::MacApplicationExt for crate::Application {
122+
impl crate::platform::mac::ApplicationExt for crate::Application {
123123
fn hide(&self) {
124124
unsafe {
125125
let () = msg_send![self.backend_app.ns_app, hide: nil];

druid-shell/src/backend/x11/application.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ impl Application {
793793
}
794794
}
795795

796-
impl crate::platform::linux::LinuxApplicationExt for crate::Application {
796+
impl crate::platform::linux::ApplicationExt for crate::Application {
797797
fn primary_clipboard(&self) -> crate::Clipboard {
798798
self.backend_app.primary.clone().into()
799799
}

druid-shell/src/platform/linux.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::Clipboard;
1818
/// Linux specific extensions to [`Application`]
1919
///
2020
/// [`Application`]: crate::Application
21-
pub trait LinuxApplicationExt {
21+
pub trait ApplicationExt {
2222
/// Returns a handle to the primary system clipboard.
2323
///
2424
/// This is useful for middle mouse paste.
@@ -32,5 +32,5 @@ mod test {
3232

3333
use super::*;
3434
use static_assertions as sa;
35-
sa::assert_impl_all!(Application: LinuxApplicationExt);
35+
sa::assert_impl_all!(Application: ApplicationExt);
3636
}

druid-shell/src/platform/mac.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/// macOS specific extensions to [`Application`]
1818
///
1919
/// [`Application`]: crate::Application
20-
pub trait MacApplicationExt {
20+
pub trait ApplicationExt {
2121
/// Hide the application this window belongs to. (cmd+H)
2222
fn hide(&self);
2323

@@ -36,5 +36,5 @@ mod test {
3636

3737
use super::*;
3838
use static_assertions as sa;
39-
sa::assert_impl_all!(Application: MacApplicationExt);
39+
sa::assert_impl_all!(Application: ApplicationExt);
4040
}

druid/src/win_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ impl<T: Data> Inner<T> {
474474

475475
#[cfg(target_os = "macos")]
476476
{
477-
use druid_shell::platform::mac::MacApplicationExt;
477+
use druid_shell::platform::mac::ApplicationExt as _;
478478

479479
let windows = &mut self.windows;
480480
let window = self.menu_window.and_then(|w| windows.get_mut(w));
@@ -841,13 +841,13 @@ impl<T: Data> AppState<T> {
841841

842842
#[cfg(target_os = "macos")]
843843
fn hide_app(&self) {
844-
use druid_shell::platform::mac::MacApplicationExt;
844+
use druid_shell::platform::mac::ApplicationExt as _;
845845
self.inner.borrow().app.hide()
846846
}
847847

848848
#[cfg(target_os = "macos")]
849849
fn hide_others(&mut self) {
850-
use druid_shell::platform::mac::MacApplicationExt;
850+
use druid_shell::platform::mac::ApplicationExt as _;
851851
self.inner.borrow().app.hide_others();
852852
}
853853

0 commit comments

Comments
 (0)