mirror of
https://github.com/servo/servo.git
synced 2025-09-19 11:20:09 +01:00
cargo: Bump rustc to 1.89 (#36818)
Update Rustc to 1.89. Reviewable by commit. Leftover work: - #37330 - #38777 --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> Co-authored-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
parent
8587536755
commit
3225d19907
126 changed files with 408 additions and 610 deletions
|
@ -10,10 +10,10 @@ use surfman::{Context, Device};
|
|||
target_os = "windows",
|
||||
all(target_os = "linux", not(target_env = "ohos"))
|
||||
)))]
|
||||
pub(crate) fn setup_gl_accelerated_media(_: RefMut<Device>, _: RefMut<Context>) {}
|
||||
pub(crate) fn setup_gl_accelerated_media(_: RefMut<'_, Device>, _: RefMut<'_, Context>) {}
|
||||
|
||||
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
|
||||
pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut<Context>) {
|
||||
pub(crate) fn setup_gl_accelerated_media(device: RefMut<'_, Device>, context: RefMut<'_, Context>) {
|
||||
use servo::Servo;
|
||||
use servo::media::{GlContext, NativeDisplay};
|
||||
use surfman::platform::generic::multi::connection::NativeConnection;
|
||||
|
@ -42,7 +42,7 @@ pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut<Context>) {
|
||||
pub(crate) fn setup_gl_accelerated_media(device: RefMut<'_, Device>, context: RefMut<'_, Context>) {
|
||||
use servo::Servo;
|
||||
use servo::media::{GlContext, NativeDisplay};
|
||||
|
||||
|
|
|
@ -135,11 +135,11 @@ impl RunningAppState {
|
|||
webview
|
||||
}
|
||||
|
||||
pub(crate) fn inner(&self) -> Ref<RunningAppStateInner> {
|
||||
pub(crate) fn inner(&self) -> Ref<'_, RunningAppStateInner> {
|
||||
self.inner.borrow()
|
||||
}
|
||||
|
||||
pub(crate) fn inner_mut(&self) -> RefMut<RunningAppStateInner> {
|
||||
pub(crate) fn inner_mut(&self) -> RefMut<'_, RunningAppStateInner> {
|
||||
self.inner.borrow_mut()
|
||||
}
|
||||
|
||||
|
@ -429,11 +429,11 @@ impl RunningAppState {
|
|||
webview.notify_scroll_event(ScrollLocation::End, origin);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowUp), || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, -1.0 * LINE_HEIGHT));
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, -LINE_HEIGHT));
|
||||
webview.notify_scroll_event(location, origin);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowDown), || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, 1.0 * LINE_HEIGHT));
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, LINE_HEIGHT));
|
||||
webview.notify_scroll_event(location, origin);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowLeft), || {
|
||||
|
|
|
@ -17,6 +17,7 @@ use servo::{
|
|||
SelectElementOptionOrOptgroup, SimpleDialog, WebDriverUserPrompt,
|
||||
};
|
||||
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
pub enum Dialog {
|
||||
File {
|
||||
dialog: EguiFileDialog,
|
||||
|
|
|
@ -33,6 +33,7 @@ impl From<accesskit_winit::Event> for AppEvent {
|
|||
|
||||
/// The real or fake OS event loop.
|
||||
#[allow(dead_code)]
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
enum EventLoop {
|
||||
/// A real Winit windowing event loop.
|
||||
Winit(winit::event_loop::EventLoop<AppEvent>),
|
||||
|
|
|
@ -908,7 +908,7 @@ impl servo::webxr::glwindow::GlWindow for XRWindow {
|
|||
}
|
||||
}
|
||||
|
||||
fn display_handle(&self) -> raw_window_handle::DisplayHandle {
|
||||
fn display_handle(&self) -> raw_window_handle::DisplayHandle<'_> {
|
||||
self.winit_window
|
||||
.display_handle()
|
||||
.expect("Every window should have a display handle")
|
||||
|
|
|
@ -176,7 +176,7 @@ impl Minibrowser {
|
|||
}
|
||||
|
||||
/// Create a frameless button with square sizing, as used in the toolbar.
|
||||
fn toolbar_button(text: &str) -> egui::Button {
|
||||
fn toolbar_button(text: &str) -> egui::Button<'_> {
|
||||
egui::Button::new(text)
|
||||
.frame(false)
|
||||
.min_size(Vec2 { x: 20.0, y: 20.0 })
|
||||
|
|
|
@ -373,11 +373,11 @@ impl RunningAppState {
|
|||
}
|
||||
}
|
||||
|
||||
fn inner(&self) -> Ref<RunningAppStateInner> {
|
||||
fn inner(&self) -> Ref<'_, RunningAppStateInner> {
|
||||
self.inner.borrow()
|
||||
}
|
||||
|
||||
fn inner_mut(&self) -> RefMut<RunningAppStateInner> {
|
||||
fn inner_mut(&self) -> RefMut<'_, RunningAppStateInner> {
|
||||
self.inner.borrow_mut()
|
||||
}
|
||||
|
||||
|
|
|
@ -47,8 +47,14 @@ pub fn get_default_url(
|
|||
}
|
||||
}
|
||||
|
||||
if new_url.is_none() && url_opt.is_some() {
|
||||
new_url = location_bar_input_to_url(url_opt.unwrap(), &preferences.searchpage);
|
||||
#[allow(
|
||||
clippy::collapsible_if,
|
||||
reason = "let chains are not available in 1.85"
|
||||
)]
|
||||
if new_url.is_none() {
|
||||
if let Some(url_opt) = url_opt {
|
||||
new_url = location_bar_input_to_url(url_opt, &preferences.searchpage);
|
||||
}
|
||||
}
|
||||
|
||||
let pref_url = parse_url_or_filename(cwd.as_ref(), &preferences.homepage).ok();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue