diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib.rs | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/lib.rs b/src/lib.rs index 444753e..465ff5e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,20 +1,19 @@ -/* - * Hexchat Plugin API Bindings for Rust - * Copyright (C) 2018 Soni L. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ +// Hexchat Plugin API Bindings for Rust +// Copyright (C) 2018, 2021 Soni L. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see <https://www.gnu.org/licenses/>. + //! Write hexchat plugins in Rust! //! //! This library provides safe API bindings for hexchat, but doesn't attempt to fix hexchat's own @@ -954,9 +953,10 @@ impl PluginHandle { /// Prints to the hexchat buffer. // this checks the context internally. if it didn't, it wouldn't be safe to have here. - pub fn print(&mut self, s: &str) { + pub fn print<T: ToString>(&mut self, s: T) { + let s = s.to_string(); unsafe { - hexchat_print_str(self.ph, s, true); + hexchat_print_str(self.ph, &*s, true); } } @@ -1186,7 +1186,7 @@ impl<'a> EnsureValidContext<'a> { /// Prints to the hexchat buffer. // as of hexchat 2.14.1, this does not call hooks. - pub fn print(&mut self, s: &str) { + pub fn print<T: ToString>(&mut self, s: T) { self.ph.print(s) } @@ -1222,13 +1222,13 @@ impl<'a> EnsureValidContext<'a> { // mutable state, std provides std::sync::Mutex which has poisoning. Other interior mutability with // poisoning could also be used. std doesn't have anything for single-threaded performance (yet), // but hexchat isn't particularly performance-critical. -type CommandHookUd = (Box<Fn(&mut PluginHandle, Word, WordEol) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); +type CommandHookUd = (Box<dyn Fn(&mut PluginHandle, Word, WordEol) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); /// Userdata type used by a server hook. -type ServerHookUd = (Box<Fn(&mut PluginHandle, Word, WordEol, EventAttrs) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); +type ServerHookUd = (Box<dyn Fn(&mut PluginHandle, Word, WordEol, EventAttrs) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); /// Userdata type used by a print hook. -type PrintHookUd = (Box<Fn(&mut PluginHandle, Word, EventAttrs) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); +type PrintHookUd = (Box<dyn Fn(&mut PluginHandle, Word, EventAttrs) -> Eat + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo); /// Userdata type used by a timer hook. -type TimerHookUd = (Rc<(Box<Fn(&mut PluginHandle) -> bool + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo)>, Rc<Cell<bool>>); +type TimerHookUd = (Rc<(Box<dyn Fn(&mut PluginHandle) -> bool + ::std::panic::RefUnwindSafe>, *mut internals::Ph, PluginInfo)>, Rc<Cell<bool>>); /// The contents of an empty CStr. /// @@ -1393,7 +1393,7 @@ impl PluginInfo { /// Plugin data stored in the hexchat plugin_handle. struct PhUserdata { - plug: Box<Plugin>, + plug: Box<dyn Plugin>, pluginfo: PluginInfo, } |