diff --git a/RELEASES.md b/RELEASES.md index b4dc100f5d5f1..5558086f1f5b2 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,12 @@ +Version 1.99.1 (2026-10-15) +=========================== + + + +* [library: fix missing symbol `wcslen` on UEFI and embedded targets](https://github.com/rust-lang/rust/issues/163614) +* [rustc: fix miscompilation of FFI `bool` return values on x86_64](https://github.com/rust-lang/rust/issues/163911) +* [rust-lld: add the rpath for `libLLVM` on macOS](https://github.com/rust-lang/rust/issues/163947) + Version 1.99.0 (2026-10-01) ========================== diff --git a/compiler/rustc_ast_lowering/src/delegation/resolution.rs b/compiler/rustc_ast_lowering/src/delegation/resolution.rs index 8e35b05d7e870..cbc56ab4eb65b 100644 --- a/compiler/rustc_ast_lowering/src/delegation/resolution.rs +++ b/compiler/rustc_ast_lowering/src/delegation/resolution.rs @@ -484,16 +484,22 @@ impl<'tcx> DelegationResolver<'_, 'tcx> { } } - mapping.map_return = SelfFinder::contains_self(sig.output()); - - let arguments_to_map = sig - .inputs() - .iter() - .enumerate() - .skip(1) // Already checked above. - .filter_map(|(idx, ¶m)| SelfFinder::contains_self(param).then_some(idx)); + // Heuristic: don't do wrapping if there is no target expression. + if delegation.body.is_some() { + let arguments_to_map = sig + .inputs() + .iter() + .enumerate() + .skip(1) // Already checked above. + .filter_map(|(idx, ¶m)| SelfFinder::contains_self(param).then_some(idx)); + + mapping.arguments_to_map.extend(arguments_to_map); + } - mapping.arguments_to_map.extend(arguments_to_map); + // Even if there is no target expression an output should be mapped, + // this is the case for functions without receiver which return `Self` + // for example. + mapping.map_return = SelfFinder::contains_self(sig.output()); } // We can't yet map more than one argument if there are definitions inside. @@ -513,11 +519,6 @@ impl<'tcx> DelegationResolver<'_, 'tcx> { parent: LocalDefId, span: Span, ) -> bool { - // Heuristic: don't do wrapping if there is no target expression. - if delegation.body.is_none() { - return false; - } - let tcx = self.tcx(); // Apply wrapping for delegations inside diff --git a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs index e8a421afacabd..8a7ad70f8ebb1 100644 --- a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs +++ b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs @@ -2141,7 +2141,16 @@ fn compare_const_generic_param_types<'tcx>( iter::zip(const_params_of(impl_item.def_id), const_params_of(trait_item.def_id)); for (param_impl, param_trait) in param_iter { - let param_impl_ty_span = tcx.ty_span(param_impl.def_id.expect_local()); + // If `impl_item` comes from RPITIT: + // + // then expecting a `LocalDefId` for `param_impl` is fraught: the synthetic + // associated type reuses the trait's generic parameters, which may be nonlocal. + // Use the impl item's span instead. + let param_impl_ty_span = if impl_item.is_impl_trait_in_trait() { + tcx.def_span(impl_item.def_id) + } else { + tcx.ty_span(param_impl.def_id.expect_local()) + }; let cause = ObligationCause::new( param_impl_ty_span, diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index f048fb04af45a..f69efebf5c950 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -250,9 +250,9 @@ bitflags::bitflags! { /// Apply remappings to documentation information const DOCUMENTATION = 1 << 5; - /// An alias for `macro`, `debuginfo` and `coverage`. This ensures all paths in compiled - /// executables, libraries and objects are remapped but not elsewhere. - const OBJECT = Self::MACRO.bits() | Self::DEBUGINFO.bits() | Self::COVERAGE.bits(); + /// An alias for `macro`, `documentation`, `debuginfo` and `coverage`. This ensures all paths in compiled + /// executables, libraries, objects and documentation outputs are remapped but not elsewhere. + const OBJECT = Self::MACRO.bits() | Self::DOCUMENTATION.bits() | Self::DEBUGINFO.bits() | Self::COVERAGE.bits(); } } diff --git a/library/std/src/sys/io/is_terminal/windows.rs b/library/std/src/sys/io/is_terminal/windows.rs index 6d66e93087911..ec6667bffb355 100644 --- a/library/std/src/sys/io/is_terminal/windows.rs +++ b/library/std/src/sys/io/is_terminal/windows.rs @@ -1,5 +1,4 @@ use crate::ffi::c_void; -use crate::mem::MaybeUninit; use crate::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle}; use crate::sys::c; @@ -27,6 +26,7 @@ fn handle_is_console(handle: BorrowedHandle<'_>) -> bool { } } _ => unsafe { + use crate::mem::MaybeUninit; // `GetConsoleMode` incurs a remote RPC round-trip (= bad), so it's best avoided. // `NtQueryVolumeInformationFile` lets us test the handle directly. // The required `FILE_DEVICE_CONSOLE` type was introduced in Windows 8. diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs index 67345d183a2d2..6f3493b12ac15 100644 --- a/library/std/src/sys/pal/windows/c.rs +++ b/library/std/src/sys/pal/windows/c.rs @@ -20,7 +20,9 @@ pub type WCHAR = u16; pub const INVALID_HANDLE_VALUE: HANDLE = ::core::ptr::without_provenance_mut(-1i32 as _); +#[cfg(not(target_vendor = "win7"))] pub const FILE_DEVICE_NAMED_PIPE: u32 = 0x00000011; +#[cfg(not(target_vendor = "win7"))] pub const FILE_DEVICE_CONSOLE: u32 = 0x00000050; // https://learn.microsoft.com/en-us/cpp/c-runtime-library/exit-success-exit-failure?view=msvc-170 diff --git a/library/std/src/sys/stdio/windows.rs b/library/std/src/sys/stdio/windows.rs index 82a4424d46989..31c99a98935ae 100644 --- a/library/std/src/sys/stdio/windows.rs +++ b/library/std/src/sys/stdio/windows.rs @@ -78,7 +78,6 @@ pub fn get_handle(handle_id: u32) -> io::Result { } /// Returns true if `handle` refers to a proper console (aka conhost). -#[cfg(not(target_vendor = "win7"))] fn is_console(handle: c::HANDLE) -> bool { cfg_select! { target_vendor = "win7" => { diff --git a/src/librustdoc/html/render/sidebar.rs b/src/librustdoc/html/render/sidebar.rs index e0bd1fc9792e6..7b282b0c61d7e 100644 --- a/src/librustdoc/html/render/sidebar.rs +++ b/src/librustdoc/html/render/sidebar.rs @@ -6,7 +6,6 @@ use askama::Template; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_hir::def::CtorKind; use rustc_hir::def_id::{DefIdMap, DefIdSet}; -use rustc_middle::ty::TyCtxt; use tracing::debug; use super::{Context, ItemSection, impl_trait_key, item_ty_to_section}; @@ -463,13 +462,14 @@ fn sidebar_assoc_items<'a>( impl_, GetMethodsMode::AlsoCollectAssocFns { assoc_fns: &mut assoc_fns }, used_links_bor, - cx.tcx(), + cx, )); } // We want links' order to be reproducible so we don't use unstable sort. assoc_consts.sort(); assoc_types.sort(); - methods.sort(); + postprocess_method_list(&mut assoc_fns); + postprocess_method_list(&mut methods); } let mut blocks = vec![ @@ -580,7 +580,7 @@ fn sidebar_deref_methods<'a>( i.inner_impl(), GetMethodsMode::Deref { deref_mut, is_deref_target_copy }, used_links, - tcx, + cx, ) .collect::>() }) @@ -601,8 +601,8 @@ fn sidebar_deref_methods<'a>( print_path(impl_.inner_impl().trait_.as_ref().unwrap(), cx), print_type(real_target, cx), ); - // We want links' order to be reproducible so we don't use unstable sort. - ret.sort(); + + postprocess_method_list(&mut ret); out.push(LinkBlock::new(Link::new(id, title), "deref-methods", ret)); } } @@ -776,7 +776,7 @@ fn get_methods<'a>( i: &'a clean::Impl, mut mode: GetMethodsMode<'_, 'a>, used_links: &mut UsedLinks, - tcx: TyCtxt<'_>, + cx: &Context<'_>, ) -> impl Iterator> { i.items.iter().filter_map(move |item| { if let Some(ref name) = item.name @@ -785,12 +785,12 @@ fn get_methods<'a>( let mut build_link = || { Link::new( get_next_url(used_links, format!("{typ}.{name}", typ = ItemType::Method)), - name.as_str(), + format!("{} ({:#})", name.as_str(), print_type(&i.for_, cx)), ) }; match &mut mode { &mut GetMethodsMode::Deref { deref_mut, is_deref_target_copy } => { - if super::should_render_item(item, deref_mut, tcx, is_deref_target_copy) { + if super::should_render_item(item, deref_mut, cx.tcx(), is_deref_target_copy) { Some(build_link()) } else { None @@ -811,6 +811,27 @@ fn get_methods<'a>( }) } +fn postprocess_method_list(methods: &mut [Link<'_>]) { + // We want links' order to be reproducible so we don't use unstable sort. + methods.sort(); + let trunc_to = |dst: &mut Cow<'_, str>, len: usize| match dst { + Cow::Borrowed(s) => *s = &s[..len], + Cow::Owned(s) => s.truncate(len), + }; + fn get_short_name<'a>(itm: Option<&'a Link<'a>>) -> Option<&'a str> { + Some(itm?.name.split_once(' ')?.0) + } + for i in 0..methods.len() { + let short_name = get_short_name(methods.get(i)); + if get_short_name(methods.get(i.wrapping_sub(1))) != short_name + && short_name != get_short_name(methods.get(i + 1)) + { + let shortened_len = short_name.unwrap().len(); + trunc_to(&mut methods[i].name, shortened_len); + } + } +} + fn get_associated_constants<'a>( i: &'a clean::Impl, used_links: &mut UsedLinks, diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 6e7a6daa307cd..acf60114bd47a 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1478,6 +1478,13 @@ so that we can apply CSS-filters to change the arrow color in themes */ padding: 4px; transform: rotate(-45deg); top: -5px; + /* So the arrow doesn't go above the content in the popover. */ + z-index: -1; +} +#settings.popover::before { + /* Because of the tabs, it renders weird if we pick a different color than the tab's + background. */ + background-color: var(--search-tab-button-not-selected-background); } .setting-line { @@ -1548,9 +1555,22 @@ so that we can apply CSS-filters to change the arrow color in themes */ border-color: var(--settings-input-color) !important; } +.settings-menu #settings { + /* This is to prevent the popover width to change when we switch tabs. I picked the biggest + width based on the setting with the longest text. The `- 2px` is to includes the borders + width when the window's width is very thin. */ + width: min(456px, calc(100vw - 2px)); +} #settings.popover { --popover-arrow-offset: 196px; top: calc(100% - 16px); + right: 1px; +} + +#settings .settings { + height: 100%; + display: flex; + flex-direction: column; } /* use larger max-width for help popover, but not for help.html */ @@ -2032,13 +2052,15 @@ a.tooltip:hover::after { #search-tabs { margin-top: 0.25rem; + margin-bottom: 4px; +} + +#search-tabs, #settings .tabs { display: flex; flex-direction: row; gap: 1px; - margin-bottom: 4px; } - -#search-tabs button { +#search-tabs button, #settings .tabs button.tab { text-align: center; font-size: 1.125rem; border: 0; @@ -2047,15 +2069,23 @@ a.tooltip:hover::after { line-height: 1.5; color: inherit; } -#search-tabs button:not(.selected) { +#search-tabs button:not(.selected), #settings .tabs button.tab:not(.selected) { background-color: var(--search-tab-button-not-selected-background); border-top-color: var(--search-tab-button-not-selected-border-top-color); } -#search-tabs button:hover, #search-tabs button.selected { +#search-tabs button:hover, #search-tabs button.selected, +#settings .tabs button.tab:hover, #settings .tabs button.tab.selected { background-color: var(--search-tab-button-selected-background); border-top-color: var(--search-tab-button-selected-border-top-color); } +#settings .settings .setting { + display: none; +} +#settings .settings .setting.selected { + display: block; +} + #search-tabs .count { font-size: 1rem; font-variant-numeric: tabular-nums; @@ -2067,8 +2097,7 @@ a.tooltip:hover::after { color: transparent; } -.search-form.loading::after -{ +.search-form.loading::after { width: 18px; height: 18px; border-radius: 18px; @@ -2777,8 +2806,11 @@ in src-script.js and main.js } /* The `overflow-y` property is used on an internal content instead of the top one otherwise the little arrow at the top can't be displayed. */ - #settings.popover .settings, #help.popover .content { + #settings.popover .settings .setting, #help.popover .content { overflow-y: scroll; + } + + #help.popover .content { height: 100%; } @@ -3491,10 +3523,10 @@ Original by Dempfi (https://github.com/dempfi/ayu) --search-results-alias-color: #c5c5c5; --search-results-grey-color: #999; --search-tab-title-count-color: #888; - --search-tab-button-not-selected-border-top-color: none; - --search-tab-button-not-selected-background: transparent !important; - --search-tab-button-selected-border-top-color: none; - --search-tab-button-selected-background: #141920 !important; + --search-tab-button-not-selected-border-top-color: #1d1f20; + --search-tab-button-not-selected-background: #1d1f20; + --search-tab-button-selected-border-top-color: #ffb44c; + --search-tab-button-selected-background: #141920; --settings-menu-filter: invert(70%); --settings-menu-hover-filter: invert(100%); --stab-background-color: #314559; @@ -3621,18 +3653,6 @@ Original by Dempfi (https://github.com/dempfi/ayu) color: #788797; } -:root[data-theme="ayu"] #search-tabs > button.selected { - border-bottom: 1px solid #ffb44c !important; - border-top: none; -} -:root[data-theme="ayu"] #search-tabs > button:not(.selected) { - border: none; - background-color: transparent !important; -} -:root[data-theme="ayu"] #search-tabs > button:hover { - border-bottom: 1px solid rgba(242, 151, 24, 0.3); -} - :root[data-theme="ayu"] .settings-menu > a img, :root[data-theme="ayu"] #sidebar-button > a::before { filter: invert(100); diff --git a/src/librustdoc/html/static/js/rustdoc.d.ts b/src/librustdoc/html/static/js/rustdoc.d.ts index 9bd6a1a587e5d..fef93a01a26cb 100644 --- a/src/librustdoc/html/static/js/rustdoc.d.ts +++ b/src/librustdoc/html/static/js/rustdoc.d.ts @@ -562,7 +562,7 @@ declare namespace rustdoc { type Dir = [string, rustdoc.Dir[], string[]] /** - * Indivitual setting object, used in `settings.js` + * Individual setting object, used in `settings.js`. */ interface Setting { js_name: string, @@ -571,6 +571,14 @@ declare namespace rustdoc { default: string | boolean, } + /** + * Individual settings tab, used in `settings.js`. + */ + interface SettingsTab { + name: string, + settings: Array, + } + /** * Single element in the data-locs field of a scraped example. * First field is the start and end char index, diff --git a/src/librustdoc/html/static/js/settings.js b/src/librustdoc/html/static/js/settings.js index 0bbeb6931e443..ef5b31a4ce407 100644 --- a/src/librustdoc/html/static/js/settings.js +++ b/src/librustdoc/html/static/js/settings.js @@ -115,52 +115,65 @@ } /** - * This function builds the sections inside the "settings page". It takes a `settings` list + * This function builds the sections inside the "settings page". It takes a `tabs` list * as argument which describes each setting and how to render it. It returns a string * representing the raw HTML. * - * @param {Array} settings + * @param {Array} tabs * * @return {string} */ - function buildSettingsPageSections(settings) { + function buildSettingsPageSections(tabs) { let output = ""; - for (const setting of settings) { - const js_data_name = setting["js_name"]; - const setting_name = setting["name"]; + output += "
"; + for (const [index, tab] of tabs.entries()) { + output += `\ + `; + } + output += "
"; + for (const [index, tab] of tabs.entries()) { + output += `\ +
`; + for (const setting of tab.settings) { + const js_data_name = setting["js_name"]; + const setting_name = setting["name"]; - if (setting["options"] !== undefined) { - // This is a select setting. - output += `\ + if (setting["options"] !== undefined) { + // This is a select setting. + output += `\
${setting_name}
`; - onEach(setting["options"], option => { - const checked = option === setting["default"] ? " checked" : ""; - const full = `${js_data_name}-${option.replace(/ /g,"-")}`; + onEach(setting["options"], option => { + const checked = option === setting["default"] ? " checked" : ""; + const full = `${js_data_name}-${option.replace(/ /g,"-")}`; - output += `\ + output += `\ `; - }); - output += `\ + }); + output += `\
`; - } else { - // This is a checkbox toggle. - const checked = setting["default"] === true ? " checked" : ""; - output += `\ + } else { + // This is a checkbox toggle. + const checked = setting["default"] === true ? " checked" : ""; + output += `\
\ \
`; + } } + output += "
"; } return output; } @@ -176,96 +189,133 @@ .split(",").filter(t => t); theme_names.push("light", "dark", "ayu"); - const settings = [ - { - "name": "Theme", - "js_name": "theme", - "default": "system preference", - "options": theme_names.concat("system preference"), - }, - { - "name": "Preferred light theme", - "js_name": "preferred-light-theme", - "default": "light", - "options": theme_names, - }, - { - "name": "Preferred dark theme", - "js_name": "preferred-dark-theme", - "default": "dark", - "options": theme_names, - }, - { - "name": "Auto-hide item contents for large items", - "js_name": "auto-hide-large-items", - "default": true, - }, - { - "name": "Auto-hide item methods' documentation", - "js_name": "auto-hide-method-docs", - "default": false, - }, - { - "name": "Auto-hide trait implementation documentation", - "js_name": "auto-hide-trait-implementations", - "default": false, - }, + const tabs = [ { - "name": "Directly go to item in search if there is only one result", - "js_name": "go-to-only-result", - "default": false, + name: "Appearance", + settings: [ + { + "name": "Theme", + "js_name": "theme", + "default": "system preference", + "options": theme_names.concat("system preference"), + }, + { + "name": "Preferred light theme", + "js_name": "preferred-light-theme", + "default": "light", + "options": theme_names, + }, + { + "name": "Preferred dark theme", + "js_name": "preferred-dark-theme", + "default": "dark", + "options": theme_names, + }, + { + "name": "Use sans serif fonts", + "js_name": "sans-serif-fonts", + "default": false, + }, + ], }, { - "name": "Show line numbers on code examples", - "js_name": "line-numbers", - "default": false, + name: "Interface", + settings: [ + { + "name": "Hide persistent navigation bar", + "js_name": "hide-sidebar", + "default": false, + }, + { + "name": "Hide table of contents", + "js_name": "hide-toc", + "default": false, + }, + { + "name": "Hide module navigation", + "js_name": "hide-modnav", + "default": false, + }, + { + "name": "Disable keyboard shortcuts", + "js_name": "disable-shortcuts", + "default": false, + }, + { + "name": "Directly go to item in search if there is only one result", + "js_name": "go-to-only-result", + "default": false, + }, + ], }, { - "name": "Hide persistent navigation bar", - "js_name": "hide-sidebar", - "default": false, - }, - { - "name": "Hide table of contents", - "js_name": "hide-toc", - "default": false, - }, - { - "name": "Hide module navigation", - "js_name": "hide-modnav", - "default": false, - }, - { - "name": "Disable keyboard shortcuts", - "js_name": "disable-shortcuts", - "default": false, - }, - { - "name": "Use sans serif fonts", - "js_name": "sans-serif-fonts", - "default": false, - }, - { - "name": "Word wrap source code", - "js_name": "word-wrap-source-code", - "default": false, - }, - { - "name": "Hide deprecated items", - "js_name": "hide-deprecated-items", - "default": false, + name: "Content", + settings: [ + { + "name": "Show line numbers on code examples", + "js_name": "line-numbers", + "default": false, + }, + { + "name": "Word wrap source code", + "js_name": "word-wrap-source-code", + "default": false, + }, + { + "name": "Auto-hide item contents for large items", + "js_name": "auto-hide-large-items", + "default": true, + }, + { + "name": "Auto-hide item methods' documentation", + "js_name": "auto-hide-method-docs", + "default": false, + }, + { + "name": "Auto-hide trait implementation documentation", + "js_name": "auto-hide-trait-implementations", + "default": false, + }, + { + "name": "Hide deprecated items", + "js_name": "hide-deprecated-items", + "default": false, + }, + ], }, ]; // Then we build the DOM. const elementKind = isSettingsPage ? "section" : "div"; - const innerHTML = `
${buildSettingsPageSections(settings)}
`; + const innerHTML = `
${buildSettingsPageSections(tabs)}
`; const el = document.createElement(elementKind); el.id = "settings"; if (!isSettingsPage) { el.className = "popover"; } el.innerHTML = innerHTML; + const selectedClass = "selected"; + onEachLazy(el.getElementsByClassName("tab"), tab => { + tab.onclick = () => { + if (tab.classList.contains(selectedClass)) { + return; + } + const selectedTab = el.querySelector(`.tab.${selectedClass}`); + if (selectedTab) { + selectedTab.classList.remove(selectedClass); + } + const name = tab.getAttribute("data-name"); + const selected = el.querySelector(`#settings .setting.${selectedClass}`); + if (selected) { + selected.classList.remove(selectedClass); + } + const newSelected = el.querySelector(`#settings .setting[data-name="${name}"]`); + if (newSelected) { + newSelected.classList.add(selectedClass); + } + tab.classList.add(selectedClass); + }; + }); if (isSettingsPage) { const mainElem = document.getElementById(MAIN_ID); @@ -274,7 +324,7 @@ } } else { el.setAttribute("tabindex", "-1"); - onEachLazy(document.querySelectorAll(".settings-menu"), menu => { + onEachLazy(document.getElementsByClassName("settings-menu"), menu => { if (menu.offsetWidth !== 0) { menu.appendChild(el); return true; @@ -288,7 +338,7 @@ function displaySettings() { settingsMenu.style.display = ""; - onEachLazy(document.querySelectorAll(".settings-menu"), menu => { + onEachLazy(document.getElementsByClassName("settings-menu"), menu => { if (menu.offsetWidth !== 0) { if (!menu.contains(settingsMenu) && settingsMenu.parentElement) { settingsMenu.parentElement.removeChild(settingsMenu); diff --git a/tests/pretty/delegation/self-mapping-output.pp b/tests/pretty/delegation/self-mapping-output.pp index 3c77be7ed6831..ac5da6fb7ff40 100644 --- a/tests/pretty/delegation/self-mapping-output.pp +++ b/tests/pretty/delegation/self-mapping-output.pp @@ -26,7 +26,7 @@ #[attr = Inline(Hint)] fn method(self: _) -> _ { from(Self { _: Trait::method(self.0) }) } #[attr = Inline(Hint)] - fn r#static() -> _ { Trait::r#static() } + fn r#static() -> _ { from(Self { _: Trait::r#static() }) } //~^ WARN: function cannot return without recursing [unconditional_recursion] #[attr = Inline(Hint)] fn raw_S(self: _) -> _ { Trait::raw_S(self.0) } @@ -36,7 +36,7 @@ #[attr = Inline(Hint)] fn method(self: _) -> _ { from(Self { _: Trait::method(self.0) }) } #[attr = Inline(Hint)] - fn r#static() -> _ { Trait::r#static() } + fn r#static() -> _ { from(Self { _: Trait::r#static() }) } #[attr = Inline(Hint)] fn raw_S(self: _) -> _ { Trait::raw_S(self.0) } } diff --git a/tests/run-make/remap-path-prefix-doctest-panic/rmake.rs b/tests/run-make/remap-path-prefix-doctest-panic/rmake.rs new file mode 100644 index 0000000000000..058f62e980fef --- /dev/null +++ b/tests/run-make/remap-path-prefix-doctest-panic/rmake.rs @@ -0,0 +1,55 @@ +// Checks that the location printed by a panicking doctest is remapped +// according to `--remap-path-scope`. +// +// Only the lines between the start of the stack backtrace and the end are +// are inspected, so timings, temp dirs and backtraces can't leak into the check. + +//@ ignore-cross-compile +//@ ignore-windows + +use run_make_support::assertion_helpers::{assert_contains, assert_not_contains}; +use run_make_support::rustdoc; + +/// Runs the failing doctest and returns stdout. +fn panic_file(scope: Option<&str>) -> String { + let mut cmd = rustdoc(); + cmd.input("src/doctest.rs") + .arg("--test") + .arg("--remap-path-prefix=src=/REMAPPED") + .arg("-Cdebuginfo=1") + .arg("--edition=2015") + .env("RUST_BACKTRACE", "1"); + + if let Some(scope) = scope { + cmd.arg(format!("--remap-path-scope={scope}")).arg("-Zunstable-options"); + } + + let out = cmd.run_fail(); + out.assert_stdout_contains("explicit panic"); + + let stdout = out.stdout_utf8(); + let section: Vec<&str> = stdout + .lines() + .skip_while(|l| l.trim() != "stack backtrace:") + .skip(1) + .take_while(|l| l.trim() != "failures:") + .collect(); + + assert!(!section.is_empty(), "no backtrace found in output:\n{stdout}"); + section.join("\n") +} + +fn main() { + // Check that with debuginfo (and related) we get the remapped path + for scope in [Some("debuginfo"), Some("object"), Some("all"), None] { + let stdout = panic_file(scope); + assert_contains(&stdout, "/REMAPPED/doctest.rs"); + assert_not_contains(&stdout, "src/doctest.rs"); + } + + for scope in ["diagnostics", "documentation", "macro"] { + let stdout = panic_file(Some(scope)); + assert_contains(&stdout, "src/doctest.rs"); + assert_not_contains(&stdout, "/REMAPPED/doctest.rs"); + } +} diff --git a/tests/run-make/remap-path-prefix-doctest-panic/src/doctest.rs b/tests/run-make/remap-path-prefix-doctest-panic/src/doctest.rs new file mode 100644 index 0000000000000..2160cc21f6b42 --- /dev/null +++ b/tests/run-make/remap-path-prefix-doctest-panic/src/doctest.rs @@ -0,0 +1,4 @@ +/// ``` +/// panic!() +/// ``` +pub fn f() {} diff --git a/tests/run-make/remap-path-prefix/rmake.rs b/tests/run-make/remap-path-prefix/rmake.rs index 3b866476e9501..0e4d002e2441c 100644 --- a/tests/run-make/remap-path-prefix/rmake.rs +++ b/tests/run-make/remap-path-prefix/rmake.rs @@ -76,7 +76,7 @@ fn main() { rmeta_contains("auxiliary"); out_diagobj.run(); rmeta_contains("/the/aux/lib.rs"); - rmeta_contains("auxiliary"); + rmeta_not_contains("auxiliary"); out_diagdocobj.run(); rmeta_contains("/the/aux/lib.rs"); rmeta_not_contains("auxiliary"); diff --git a/tests/rustdoc-gui/copy-code.goml b/tests/rustdoc-gui/copy-code.goml index 13cf2290d7791..b6a964e3ea843 100644 --- a/tests/rustdoc-gui/copy-code.goml +++ b/tests/rustdoc-gui/copy-code.goml @@ -51,7 +51,7 @@ assert: |copy_height| > 0 && |copy_width| > 0 assert-clipboard: "" // We make the line numbers appear. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#line-numbers" wait-for-local-storage: {"rustdoc-line-numbers": "true" } diff --git a/tests/rustdoc-gui/font-serif-change.goml b/tests/rustdoc-gui/font-serif-change.goml index 32e95cdc6ee17..1727fcfcc1d68 100644 --- a/tests/rustdoc-gui/font-serif-change.goml +++ b/tests/rustdoc-gui/font-serif-change.goml @@ -9,7 +9,7 @@ assert-css: ("body", {"font-family": |serif_font|}) assert-css: ("p code", {"font-family": |serif_code_font|}) // We now switch to the sans serif font -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {"tab_name": "Appearance"}) click: "#sans-serif-fonts" store-value: (font, '"Fira Sans", sans-serif') @@ -23,7 +23,7 @@ assert-css: ("body", {"font-family": |font|}) assert-css: ("p code", {"font-family": |code_font|}) // We switch back to the serif font -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {"tab_name": "Appearance"}) click: "#sans-serif-fonts" assert-css: ("body", {"font-family": |serif_font|}) diff --git a/tests/rustdoc-gui/help-page.goml b/tests/rustdoc-gui/help-page.goml index 34b4081402766..a35f84bd5e866 100644 --- a/tests/rustdoc-gui/help-page.goml +++ b/tests/rustdoc-gui/help-page.goml @@ -1,4 +1,5 @@ // This test ensures that opening the help page in its own tab works. +include: "utils.goml" go-to: "file://" + |DOC_PATH| + "/help.html" set-window-size: (1000, 1000) // Try desktop size first. wait-for: "#help" @@ -55,8 +56,24 @@ wait-for: "#search-tabs" // Waiting for the search.js to load. set-window-size: (1000, 1000) // Only supported on desktop. assert-false: "#help" click: "rustdoc-toolbar .help-menu > a" -assert-css: ("#help", {"display": "block"}) +wait-for-css: ("#help", {"display": "block"}) assert-css: ("#help dd", {"font-size": "16px"}) + +define-function: ("check-arrow-color", [theme], block { + call-function: ("switch-theme", {"theme": |theme|}) + click: "rustdoc-toolbar .help-menu > a" + wait-for-css: ("#help", {"display": "block"}) + store-css: ("#help", {"background-color": background}) + assert-css: ("#help::before", { + "background-color": |background|, + }) +}) + +// We check that the "top arrow" has the same color as the popover background. +call-function: ("check-arrow-color", {"theme": "ayu"}) +call-function: ("check-arrow-color", {"theme": "dark"}) +call-function: ("check-arrow-color", {"theme": "light"}) + click: "rustdoc-toolbar .help-menu > a" assert-false: "#help" diff --git a/tests/rustdoc-gui/hide-mobile-topbar.goml b/tests/rustdoc-gui/hide-mobile-topbar.goml index 1e46d23582793..8e029f68246d9 100644 --- a/tests/rustdoc-gui/hide-mobile-topbar.goml +++ b/tests/rustdoc-gui/hide-mobile-topbar.goml @@ -1,4 +1,7 @@ // Checks sidebar resizing stays synced with the setting + +include: "utils.goml" + go-to: "file://" + |DOC_PATH| + "/settings.html" set-window-size: (400, 600) @@ -9,6 +12,7 @@ assert-property: ("#hide-sidebar", {"checked": "false"}) assert-css: ("rustdoc-topbar", {"display": "flex"}) // Toggle it +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) click: "#hide-sidebar" assert-property: ("#hide-sidebar", {"checked": "true"}) assert-css: ("rustdoc-topbar", {"display": "none"}) diff --git a/tests/rustdoc-gui/mobile-topbar-menu-popovers.goml b/tests/rustdoc-gui/mobile-topbar-menu-popovers.goml index 29a2096bba895..91bb20ff1aa22 100644 --- a/tests/rustdoc-gui/mobile-topbar-menu-popovers.goml +++ b/tests/rustdoc-gui/mobile-topbar-menu-popovers.goml @@ -1,6 +1,6 @@ // Ensure that topbar popover menus content can be scrolled on mobile. go-to: "file://" + |DOC_PATH| + "/lib2/index.html" -store-value: (window_height, 500) +store-value: (window_height, 300) set-window-size: (400, |window_height|) include: "utils.goml" @@ -8,16 +8,16 @@ include: "utils.goml" // We open the settings menu call-function: ("open-settings-menu", {}) // We ensure it's not scrolled down yet. -assert-property: ("#settings .settings", {"scrollTop": 0}) +assert-property: ("#settings .settings .setting", {"scrollTop": 0}) // We ensure its height is smaller than the window's, but its content's height is bigger. -store-property: ("#settings .settings", {"offsetHeight": menu_height, "scrollHeight": scroll_height}) +store-property: ("#settings .settings .setting", {"offsetHeight": menu_height, "scrollHeight": scroll_height}) assert: |menu_height| < |window_height| && |scroll_height| > |window_height| // We scroll to the last element of the menu. scroll-to: "#settings .setting-line:last-of-type input" // The item should be visible now, and so the Y scroll value should have changed. // Note: The `scrollTop` value will change if settings are added or removed. -assert-property: ("#settings .settings", {"scrollTop": 335}) +assert-property: ("#settings .settings .setting", {"scrollTop": 84}) // Now we open the help menu. click: ".help-menu a" @@ -31,4 +31,4 @@ assert: |menu_height| < |window_height| && |scroll_height| > |window_height| // We scroll to the last element of the menu. scroll-to: "#help .infos > :last-child" // The item should be visible now, and so the Y scroll value should have changed. -assert-property: ("#help .content", {"scrollTop": 339}) +assert-property: ("#help .content", {"scrollTop": 439}) diff --git a/tests/rustdoc-gui/search-tab.goml b/tests/rustdoc-gui/search-tab.goml index 54457924e4125..956776987877a 100644 --- a/tests/rustdoc-gui/search-tab.goml +++ b/tests/rustdoc-gui/search-tab.goml @@ -39,15 +39,15 @@ define-function: ( call-function: ("check-colors", { "theme": "ayu", - "background": "transparent", + "background": "#1d1f20", "background_selected": "#141920", - "background_hover": "transparent", + "background_hover": "#141920", "border_bottom": "0px none #c5c5c5", - "border_bottom_selected": "1px solid #ffb44c", - "border_bottom_hover": "1px solid rgba(242, 151, 24, 0.3)", - "border_top": "0px none #c5c5c5", - "border_top_selected": "0px none #c5c5c5", - "border_top_hover": "0px none #c5c5c5", + "border_bottom_selected": "0px none #c5c5c5", + "border_bottom_hover": "0px none #c5c5c5", + "border_top": "2px solid #1d1f20", + "border_top_selected": "2px solid #ffb44c", + "border_top_hover": "2px solid #ffb44c", }) call-function: ("check-colors", { "theme": "dark", diff --git a/tests/rustdoc-gui/setting-auto-hide-content-large-items.goml b/tests/rustdoc-gui/setting-auto-hide-content-large-items.goml index dbf80ae34912b..bdc7a2ac31008 100644 --- a/tests/rustdoc-gui/setting-auto-hide-content-large-items.goml +++ b/tests/rustdoc-gui/setting-auto-hide-content-large-items.goml @@ -27,6 +27,7 @@ call-function: ("check-setting", { }) // Now we change its value. +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#auto-hide-large-items" assert-local-storage: {"rustdoc-auto-hide-large-items": "false"} @@ -40,6 +41,7 @@ call-function: ("check-setting", { }) // And now we re-enable the setting. +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#auto-hide-large-items" assert-local-storage: {"rustdoc-auto-hide-large-items": "true"} diff --git a/tests/rustdoc-gui/setting-auto-hide-item-methods-docs.goml b/tests/rustdoc-gui/setting-auto-hide-item-methods-docs.goml index 89c1a8b0e98e9..a5a468326608d 100644 --- a/tests/rustdoc-gui/setting-auto-hide-item-methods-docs.goml +++ b/tests/rustdoc-gui/setting-auto-hide-item-methods-docs.goml @@ -24,6 +24,7 @@ call-function: ("check-setting", { }) // Now we change its value. +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#auto-hide-method-docs" assert-local-storage: {"rustdoc-auto-hide-method-docs": "true"} @@ -37,6 +38,7 @@ call-function: ("check-setting", { }) // And now we re-disable the setting. +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#auto-hide-method-docs" assert-local-storage: {"rustdoc-auto-hide-method-docs": "false"} diff --git a/tests/rustdoc-gui/setting-auto-hide-trait-implementations.goml b/tests/rustdoc-gui/setting-auto-hide-trait-implementations.goml index 81c26bfb7f3a0..2c140c0245c79 100644 --- a/tests/rustdoc-gui/setting-auto-hide-trait-implementations.goml +++ b/tests/rustdoc-gui/setting-auto-hide-trait-implementations.goml @@ -22,6 +22,7 @@ call-function: ("check-setting", { "toggle_attribute_value": "", }) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) // Now we change its value. click: "#auto-hide-trait-implementations" assert-local-storage: {"rustdoc-auto-hide-trait-implementations": "true"} @@ -35,6 +36,7 @@ call-function: ("check-setting", { "toggle_attribute_value": null, }) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) // And now we re-disable the setting. click: "#auto-hide-trait-implementations" assert-local-storage: {"rustdoc-auto-hide-trait-implementations": "false"} diff --git a/tests/rustdoc-gui/setting-go-to-only-result.goml b/tests/rustdoc-gui/setting-go-to-only-result.goml index f94f45fe102ef..be15ce2c3f1c0 100644 --- a/tests/rustdoc-gui/setting-go-to-only-result.goml +++ b/tests/rustdoc-gui/setting-go-to-only-result.goml @@ -27,7 +27,7 @@ wait-for: "#search" assert-document-property: ({"URL": "/lib2/index.html"}, CONTAINS) // Now we change its value. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) click: "#go-to-only-result" assert-local-storage: {"rustdoc-go-to-only-result": "true"} @@ -58,6 +58,7 @@ call-function: ("check-setting", { }) // And now we re-disable the setting. +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) click: "#go-to-only-result" assert-local-storage: {"rustdoc-go-to-only-result": "false"} @@ -105,7 +106,7 @@ write-into: (".search-input", "Whitespace") call-function: ("search-multiple-results", {"location": |location|}) // We now toggle the setting and reload the page. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) click: "#go-to-only-result" assert-local-storage: {"rustdoc-go-to-only-result": "true"} diff --git a/tests/rustdoc-gui/setting-hide-deprecated.goml b/tests/rustdoc-gui/setting-hide-deprecated.goml index 0fefe00f9457b..eee48c8ce88d4 100644 --- a/tests/rustdoc-gui/setting-hide-deprecated.goml +++ b/tests/rustdoc-gui/setting-hide-deprecated.goml @@ -12,7 +12,7 @@ assert-count: ("dt" + |deprecated_class|, 2) assert-css: ("dt" + |deprecated_class|, {"display": "block"}, ALL) // We enable the "hide deprecated items" setting. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#hide-deprecated-items" // None of them should be displayed anymore. wait-for-css: ("dt" + |deprecated_class|, {"display": "none"}, ALL) @@ -31,7 +31,7 @@ assert-count: ("details" + |deprecated_class|, 2) assert-css: ("details" + |deprecated_class|, {"display": "block"}, ALL) // We enable the "hide deprecated items" setting. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#hide-deprecated-items" // They shouldn't be displayed anymore. @@ -56,7 +56,7 @@ assert: "details:not(" + |deprecated_class| + ") #method\.future_deprecated_fn" assert-css: ("details" + |deprecated_class|, {"display": "block"}, ALL) // We enable the "hide deprecated items" setting. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#hide-deprecated-items" // They shouldn't be displayed anymore. @@ -84,7 +84,7 @@ assert-text: ( ) assert-css: ("#results ul.search-results.active .deprecated-count", {"display": "none"}) // We enable the "hide deprecated items" setting. -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) click: "#hide-deprecated-items" // None of them should be displayed anymore. wait-for-css: ( diff --git a/tests/rustdoc-gui/settings.goml b/tests/rustdoc-gui/settings.goml index 85994be468d3c..52f2dc57c8e27 100644 --- a/tests/rustdoc-gui/settings.goml +++ b/tests/rustdoc-gui/settings.goml @@ -150,6 +150,7 @@ compare-elements-position-near: ( {"y": 1} ) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) // First we check the "default" display for toggles. assert-css: ( "#auto-hide-large-items", @@ -241,6 +242,7 @@ assert-css: ( ) // We now switch the display. +call-function: ("change-settings-tab", {'tab_name': 'Appearance'}) click: "#theme-system-preference" // Wait for the hidden element to show up. wait-for: "#preferred-dark-theme.setting-line:not(.hidden)" @@ -250,8 +252,77 @@ assert: "#preferred-light-theme.setting-line:not(.hidden)" assert-text: ("#preferred-dark-theme .setting-radio-name", "Preferred dark theme") assert-text: ("#preferred-light-theme .setting-radio-name", "Preferred light theme") +// We check the display of the settings popover tabs. +define-function: ( + "check-tabs", + [theme, background, background_selected, background_hover, border_bottom, + border_bottom_selected, border_bottom_hover, border_top, border_top_selected, + border_top_hover], + block { + call-function: ("switch-theme-and-keep-open", {"theme": |theme|}) + + assert-css: ("#settings .tabs > button.tab:not(.selected)", { + "background-color": |background|, + "border-bottom": |border_bottom|, + "border-top": |border_top|, + }) + assert-css: ("#settings .tabs > button.tab.selected", { + "background-color": |background_selected|, + "border-bottom": |border_bottom_selected|, + "border-top": |border_top_selected|, + }) + // We ensure that the popover "top arrow" has the same color as the tabs background. + assert-css: ("#settings::before", { + "background-color": |background|, + }) + move-cursor-to: "#settings .tabs > button.tab:not(.selected)" + assert-css: ("#settings .tabs > button.tab:not(.selected):hover", { + "background-color": |background_hover|, + "border-bottom": |border_bottom_hover|, + "border-top": |border_top_hover|, + }) +}) + +call-function: ("check-tabs", { + "theme": "ayu", + "background": "#1d1f20", + "background_selected": "#141920", + "background_hover": "#141920", + "border_bottom": "0px none #c5c5c5", + "border_bottom_selected": "0px none #c5c5c5", + "border_bottom_hover": "0px none #c5c5c5", + "border_top": "2px solid #1d1f20", + "border_top_selected": "2px solid #ffb44c", + "border_top_hover": "2px solid #ffb44c", +}) +call-function: ("check-tabs", { + "theme": "dark", + "background": "#252525", + "background_selected": "#353535", + "background_hover": "#353535", + "border_bottom": "0px none #ddd", + "border_bottom_selected": "0px none #ddd", + "border_bottom_hover": "0px none #ddd", + "border_top": "2px solid #252525", + "border_top_selected": "2px solid #0089ff", + "border_top_hover": "2px solid #0089ff", +}) +call-function: ("check-tabs", { + "theme": "light", + "background": "#e6e6e6", + "background_selected": "#fff", + "background_hover": "#fff", + "border_bottom": "0px none #000", + "border_bottom_selected": "0px none #000", + "border_bottom_hover": "0px none #000", + "border_top": "2px solid #e6e6e6", + "border_top_selected": "2px solid #0089ff", + "border_top_hover": "2px solid #0089ff", +}) + // We now check that clicking on the toggles' text is like clicking on the checkbox. // To test it, we use the "Disable keyboard shortcuts". +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) set-local-storage: {"rustdoc-disable-shortcuts": "false"} click: "#disable-shortcuts" assert-local-storage: {"rustdoc-disable-shortcuts": "true"} @@ -312,7 +383,7 @@ assert-css: (".setting-line", {"margin": |setting_line_margin|}) // We will check that the checkboxes size doesn't change either. assert-size: ( - "#settings label > input[type='checkbox']", + "#settings .selected label > input[type='checkbox']", {"width": 19, "height": 19}, ALL, ) @@ -333,7 +404,7 @@ assert-css: (".setting-radio", {"cursor": "pointer"}) // We ensure that the checkboxes size didn't change. assert-size: ( - "#settings label > input[type='checkbox']", + "#settings .selected label > input[type='checkbox']", {"width": 19, "height": 19}, ALL, ) diff --git a/tests/rustdoc-gui/sidebar-resize-setting.goml b/tests/rustdoc-gui/sidebar-resize-setting.goml index 132f5f387b29f..ea04c10ba06e4 100644 --- a/tests/rustdoc-gui/sidebar-resize-setting.goml +++ b/tests/rustdoc-gui/sidebar-resize-setting.goml @@ -5,8 +5,7 @@ assert-property: (".sidebar", {"clientWidth": "199"}) show-text: true // Verify that the "hide" option is unchecked -call-function: ("open-settings-menu", {}) -assert-css: ("#settings", {"display": "block"}) +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) assert-property: ("#hide-sidebar", {"checked": "false"}) press-key: "Escape" wait-for-css: ("#settings", {"display": "none"}) @@ -28,7 +27,7 @@ go-to: "file://" + |DOC_PATH| + "/test_docs/index.html" set-window-size: (600, 600) focus: "rustdoc-topbar .settings-menu a" press-key: "Enter" -wait-for-css: ("#settings", {"display": "block"}) +call-function: ("change-settings-tab", {'tab_name': 'Interface'}) wait-for-css: ("#sidebar-button", {"position": "static"}) assert-property: ("#hide-sidebar", {"checked": "false"}) click: "#hide-sidebar" diff --git a/tests/rustdoc-gui/source-code-wrapping.goml b/tests/rustdoc-gui/source-code-wrapping.goml index 6dc56672da805..8534bb35b73d1 100644 --- a/tests/rustdoc-gui/source-code-wrapping.goml +++ b/tests/rustdoc-gui/source-code-wrapping.goml @@ -14,7 +14,7 @@ define-function: ( ) store-size: (".rust code", {"width": width, "height": height}) -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) call-function: ("click-code-wrapping", {"expected": "true"}) wait-for-size-false: (".rust code", {"width": |width|, "height": |height|}) store-size: (".rust code", {"width": new_width, "height": new_height}) @@ -28,7 +28,7 @@ assert-size: (".rust code", {"width": |width|, "height": |height|}) // Now let's check in docs code examples. go-to: "file://" + |DOC_PATH| + "/test_docs/trait_bounds/index.html" -call-function: ("open-settings-menu", {}) +call-function: ("change-settings-tab", {'tab_name': 'Content'}) store-property: (".example-wrap .rust code", {"scrollWidth": rust_width, "scrollHeight": rust_height}) store-property: (".example-wrap .language-text code", {"scrollWidth": txt_width, "scrollHeight": txt_height}) diff --git a/tests/rustdoc-gui/utils.goml b/tests/rustdoc-gui/utils.goml index 24ce5f7b0e03b..b4576c6ebcaaf 100644 --- a/tests/rustdoc-gui/utils.goml +++ b/tests/rustdoc-gui/utils.goml @@ -44,6 +44,18 @@ define-function: ( } ) +define-function: ( + "change-settings-tab", + [tab_name], + block { + // In case it's not open yet, we open it. + call-function: ("open-settings-menu", {}) + click: "#settings .tabs button[data-name='" + |tab_name| + "']" + // We ensure it worked. + wait-for: "#settings .tabs button[data-name='" + |tab_name| + "'].selected" + } +) + define-function: ( "close-settings-menu", [], @@ -64,19 +76,28 @@ define-function: ( ) define-function: ( - "switch-theme", + "switch-theme-and-keep-open", [theme], block { - // Set the theme. - call-function: ("open-settings-menu", {}) + // Open the settings menu. + call-function: ("change-settings-tab", {'tab_name': 'Appearance'}) // Change the setting. click: "#theme-"+ |theme| - call-function: ("close-settings-menu", {}) // Ensure that the local storage was correctly updated. assert-local-storage: {"rustdoc-theme": |theme|} }, ) +define-function: ( + "switch-theme", + [theme], + block { + call-function: ("switch-theme-and-keep-open", {'theme': |theme|}) + // Close the settings menu. + call-function: ("close-settings-menu", {}) + }, +) + define-function: ( "open-search", [], @@ -134,7 +155,7 @@ define-function: ( "switch-line-numbers-setting", [expected_status], block { - call-function: ("open-settings-menu", {}) + call-function: ("change-settings-tab", {'tab_name': 'Content'}) // We change the line numbers setting. click: "#line-numbers" call-function: ("close-settings-menu", {}) diff --git a/tests/rustdoc-html/sidebar/sidebar-dupes.rs b/tests/rustdoc-html/sidebar/sidebar-dupes.rs new file mode 100644 index 0000000000000..ce521e150bc5e --- /dev/null +++ b/tests/rustdoc-html/sidebar/sidebar-dupes.rs @@ -0,0 +1,22 @@ +#![crate_name = "foo"] + +// Test to ensure identically named methods in the sidebar get a disambiguator + +//@ has foo/struct.C.html +pub struct A; +pub struct B; +pub struct C(T); + +impl C { + //@ matches - "//a[@href='#method.dupe']" "^dupe \(C\)$" + pub fn dupe(self) {} + //@ matches - "//a[@href='#method.uniq1']" "^uniq1$" + pub fn uniq1(self) {} +} + +impl C { + //@ matches - "//a[@href='#method.dupe-1']" "^dupe \(C\)$" + pub fn dupe(self) {} + //@ matches - "//a[@href='#method.uniq2']" "^uniq2$" + pub fn uniq2(self) {} +} diff --git a/tests/rustdoc-json/remap-path-prefix/object.rs b/tests/rustdoc-json/remap-path-prefix/object.rs index 052ad7651eeab..00df241249317 100644 --- a/tests/rustdoc-json/remap-path-prefix/object.rs +++ b/tests/rustdoc-json/remap-path-prefix/object.rs @@ -1,5 +1,5 @@ //@ compile-flags: --remap-path-prefix={{src-base}}=/remapped //@ compile-flags: --remap-path-scope=object -Zunstable-options -//@ is "$.index[?(@.name=='StrLike')].span.filename" $FILE +//@ is "$.index[?(@.name=='StrLike')].span.filename" \"/remapped/remap-path-prefix/object.rs\" pub trait StrLike {} diff --git a/tests/ui/const-generics/auxiliary/non_local.rs b/tests/ui/const-generics/auxiliary/non_local.rs index 38a030d610be6..de0dc2ae85aee 100644 --- a/tests/ui/const-generics/auxiliary/non_local.rs +++ b/tests/ui/const-generics/auxiliary/non_local.rs @@ -1,3 +1,8 @@ pub trait NonLocal { fn method(); } + +use std::future::Future; +pub trait R { + fn read(&mut self) -> impl Future; +} diff --git a/tests/ui/const-generics/non-local-method-same-ok.rs b/tests/ui/const-generics/non-local-method-same-ok.rs new file mode 100644 index 0000000000000..8d67188fa8bca --- /dev/null +++ b/tests/ui/const-generics/non-local-method-same-ok.rs @@ -0,0 +1,15 @@ +// Adapted from; https://github.com/rust-lang/rust/issues/164180#issuecomment-6168887401 +//@ check-pass +//@ compile-flags: --crate-type lib +//@ aux-build:non_local.rs +//@ edition: 2024 + +extern crate non_local; + +struct Local; + +impl non_local::R for Local { + async fn read(&mut self) -> [u8; L] { + [0; L] + } +} diff --git a/tests/ui/const-generics/non-local-method.rs b/tests/ui/const-generics/non-local-method.rs index 290d7fc903eff..b041e0ee7be60 100644 --- a/tests/ui/const-generics/non-local-method.rs +++ b/tests/ui/const-generics/non-local-method.rs @@ -1,5 +1,6 @@ //@ compile-flags: --crate-type lib //@ aux-build:non_local.rs +//@ edition: 2024 extern crate non_local; @@ -13,3 +14,10 @@ impl NonLocal for Local { print!("hello\n"); } } + +impl non_local::R for Local { + async fn read(&mut self) -> [u16; L] { + //~^ ERROR: expected `impl Future` to be a future that resolves to `[u8; L]`, but it resolves to `[u16; L]` + [0; L] + } +} diff --git a/tests/ui/const-generics/non-local-method.stderr b/tests/ui/const-generics/non-local-method.stderr index 0619570689da3..850f248732e2c 100644 --- a/tests/ui/const-generics/non-local-method.stderr +++ b/tests/ui/const-generics/non-local-method.stderr @@ -1,9 +1,25 @@ error[E0053]: associated function `method` has an incompatible type for const generic parameter - --> $DIR/non-local-method.rs:11:24 + --> $DIR/non-local-method.rs:12:24 | LL | fn method() { | ^^^ expected `i32`, found `u16` -error: aborting due to 1 previous error +error[E0271]: expected `impl Future` to be a future that resolves to `[u8; L]`, but it resolves to `[u16; L]` + --> $DIR/non-local-method.rs:19:49 + | +LL | async fn read(&mut self) -> [u16; L] { + | ^^^^^^^^ expected `[u8; L]`, found `[u16; L]` + | + = note: expected array `[u8; L]` + found array `[u16; L]` +note: required by a bound in `R::read::{anon_assoc#0}` + --> $DIR/auxiliary/non_local.rs:7:55 + | +LL | pub trait R { +LL | fn read(&mut self) -> impl Future; + | ^^^^^^^^^^^^^^^^ required by this bound in `R::read::{anon_assoc#0}` + +error: aborting due to 2 previous errors -For more information about this error, try `rustc --explain E0053`. +Some errors have detailed explanations: E0053, E0271. +For more information about an error, try `rustc --explain E0053`. diff --git a/tests/ui/delegation/self-mapping-output.rs b/tests/ui/delegation/self-mapping-output.rs index d20240bd6d88f..57338a7bd3aa3 100644 --- a/tests/ui/delegation/self-mapping-output.rs +++ b/tests/ui/delegation/self-mapping-output.rs @@ -17,7 +17,6 @@ mod success { impl Trait for W { reuse Trait::method { self.0 } reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::raw_S { self.0 } } @@ -45,7 +44,6 @@ mod success_non_field { impl Trait for W { reuse Trait::method { S } reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::raw_S { S } } @@ -81,7 +79,6 @@ mod success_generics { impl<'a, T, const N: usize> Trait<'a, T, N> for W<'a, 'static, T, (), N, 123> { reuse Trait::<'a, T, N>::method { self.0 } reuse Trait::<'a, T, N>::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::<'a, T, N>::raw_S { self.0 } } @@ -110,7 +107,6 @@ mod no_constructor { reuse Trait::method { self.0 } //~^ ERROR: no field `0` on type `&no_constructor::W` reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::raw_S { self.0 } //~^ ERROR: no field `0` on type `&no_constructor::W` } @@ -142,7 +138,7 @@ mod more_than_one_field { reuse Trait::method { self.0 } //~^ ERROR: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] + //~^ ERROR: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` reuse Trait::raw_S { self.0 } } @@ -150,6 +146,7 @@ mod more_than_one_field { reuse Trait::method { self.0 } //~^ ERROR: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` reuse Trait::r#static; + //~^ ERROR: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` reuse Trait::raw_S { self.0 } } } @@ -300,7 +297,6 @@ mod wrong_target_expression { //~^ ERROR: mismatched types reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::raw_S { F } } @@ -335,7 +331,6 @@ mod privacy { //~^ ERROR: field `0` of struct `private::W` is private reuse Trait::r#static; - //~^ WARN: function cannot return without recursing [unconditional_recursion] reuse Trait::raw_S { self.0 } //~^ ERROR: field `0` of struct `private::W` is private diff --git a/tests/ui/delegation/self-mapping-output.stderr b/tests/ui/delegation/self-mapping-output.stderr index 621ad70811381..b10bd2598097e 100644 --- a/tests/ui/delegation/self-mapping-output.stderr +++ b/tests/ui/delegation/self-mapping-output.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `0` on type `&no_constructor::W` - --> $DIR/self-mapping-output.rs:110:36 + --> $DIR/self-mapping-output.rs:107:36 | LL | reuse Trait::method { self.0 } | ^ unknown field @@ -11,7 +11,7 @@ LL + reuse Trait::method { self.s } | error[E0609]: no field `0` on type `&no_constructor::W` - --> $DIR/self-mapping-output.rs:114:35 + --> $DIR/self-mapping-output.rs:110:35 | LL | reuse Trait::raw_S { self.0 } | ^ unknown field @@ -23,7 +23,7 @@ LL + reuse Trait::raw_S { self.s } | error[E0609]: no field `0` on type `&no_constructor::W` - --> $DIR/self-mapping-output.rs:119:36 + --> $DIR/self-mapping-output.rs:115:36 | LL | reuse Trait::method { self.0 } | ^ unknown field @@ -35,7 +35,7 @@ LL + reuse Trait::method { self.s } | error[E0609]: no field `0` on type `&no_constructor::W` - --> $DIR/self-mapping-output.rs:122:35 + --> $DIR/self-mapping-output.rs:118:35 | LL | reuse Trait::raw_S { self.0 } | ^ unknown field @@ -47,19 +47,31 @@ LL + reuse Trait::raw_S { self.s } | error[E0063]: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` - --> $DIR/self-mapping-output.rs:142:22 + --> $DIR/self-mapping-output.rs:138:22 | LL | reuse Trait::method { self.0 } | ^^^^^^ missing `0`, `1` and `2` error[E0063]: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` - --> $DIR/self-mapping-output.rs:150:22 + --> $DIR/self-mapping-output.rs:140:22 + | +LL | reuse Trait::r#static; + | ^^^^^^^^ missing `0`, `1` and `2` + +error[E0063]: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` + --> $DIR/self-mapping-output.rs:146:22 | LL | reuse Trait::method { self.0 } | ^^^^^^ missing `0`, `1` and `2` +error[E0063]: missing fields `0`, `1` and `2` in initializer of `more_than_one_field::W` + --> $DIR/self-mapping-output.rs:148:22 + | +LL | reuse Trait::r#static; + | ^^^^^^^^ missing `0`, `1` and `2` + error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:182:25 + --> $DIR/self-mapping-output.rs:179:25 | LL | pub fn method(_: impl super::Trait) -> impl super::Trait { | ----------------- the found opaque type @@ -74,7 +86,7 @@ LL | reuse to_reuse::method { self.0 } found opaque type `impl non_trait_path_reuse::Trait` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:184:25 + --> $DIR/self-mapping-output.rs:181:25 | LL | pub fn r#static() -> impl super::Trait { | ----------------- the found opaque type @@ -89,13 +101,13 @@ LL | reuse to_reuse::r#static; found opaque type `impl non_trait_path_reuse::Trait` error[E0609]: no field `0` on type `impl super::Trait` - --> $DIR/self-mapping-output.rs:189:39 + --> $DIR/self-mapping-output.rs:186:39 | LL | reuse to_reuse::method { self.0 } | ^ unknown field error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:211:31 + --> $DIR/self-mapping-output.rs:208:31 | LL | reuse Trait::method { self.0 } | ------ ^^^^^^ expected `&_`, found `()` @@ -105,7 +117,7 @@ LL | reuse Trait::method { self.0 } = note: expected reference `&_` found unit type `()` note: method defined here - --> $DIR/self-mapping-output.rs:197:12 + --> $DIR/self-mapping-output.rs:194:12 | LL | fn method(&self) -> (); | ^^^^^^ ---- @@ -115,14 +127,14 @@ LL | reuse Trait::method { &self.0 } | + error[E0283]: type annotations needed - --> $DIR/self-mapping-output.rs:214:22 + --> $DIR/self-mapping-output.rs:211:22 | LL | reuse Trait::r#static; | ^^^^^^^^ cannot infer type | = note: the type must implement `non_Self_return_type::Trait` help: the following types implement trait `non_Self_return_type::Trait` - --> $DIR/self-mapping-output.rs:203:5 + --> $DIR/self-mapping-output.rs:200:5 | LL | impl Trait for S { | ^^^^^^^^^^^^^^^^ `non_Self_return_type::S` @@ -131,7 +143,7 @@ LL | impl Trait for W { | ^^^^^^^^^^^^^^^^ `non_Self_return_type::W` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:217:30 + --> $DIR/self-mapping-output.rs:214:30 | LL | reuse Trait::raw_S { self.0 } | ----- ^^^^^^ expected `&_`, found `()` @@ -141,7 +153,7 @@ LL | reuse Trait::raw_S { self.0 } = note: expected reference `&_` found unit type `()` note: method defined here - --> $DIR/self-mapping-output.rs:199:12 + --> $DIR/self-mapping-output.rs:196:12 | LL | fn raw_S(&self) -> S { S } | ^^^^^ ----- @@ -151,7 +163,7 @@ LL | reuse Trait::raw_S { &self.0 } | + error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:222:31 + --> $DIR/self-mapping-output.rs:219:31 | LL | reuse Trait::method { self.0 } | ------ ^^^^^^ expected `&_`, found `()` @@ -161,7 +173,7 @@ LL | reuse Trait::method { self.0 } = note: expected reference `&_` found unit type `()` note: method defined here - --> $DIR/self-mapping-output.rs:197:12 + --> $DIR/self-mapping-output.rs:194:12 | LL | fn method(&self) -> (); | ^^^^^^ ---- @@ -171,14 +183,14 @@ LL | reuse Trait::method { &self.0 } | + error[E0283]: type annotations needed - --> $DIR/self-mapping-output.rs:225:22 + --> $DIR/self-mapping-output.rs:222:22 | LL | reuse Trait::r#static; | ^^^^^^^^ cannot infer type | = note: the type must implement `non_Self_return_type::Trait` help: the following types implement trait `non_Self_return_type::Trait` - --> $DIR/self-mapping-output.rs:203:5 + --> $DIR/self-mapping-output.rs:200:5 | LL | impl Trait for S { | ^^^^^^^^^^^^^^^^ `non_Self_return_type::S` @@ -187,7 +199,7 @@ LL | impl Trait for W { | ^^^^^^^^^^^^^^^^ `non_Self_return_type::W` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:228:30 + --> $DIR/self-mapping-output.rs:225:30 | LL | reuse Trait::raw_S { self.0 } | ----- ^^^^^^ expected `&_`, found `()` @@ -197,7 +209,7 @@ LL | reuse Trait::raw_S { self.0 } = note: expected reference `&_` found unit type `()` note: method defined here - --> $DIR/self-mapping-output.rs:199:12 + --> $DIR/self-mapping-output.rs:196:12 | LL | fn raw_S(&self) -> S { S } | ^^^^^ ----- @@ -207,7 +219,7 @@ LL | reuse Trait::raw_S { &self.0 } | + error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:254:38 + --> $DIR/self-mapping-output.rs:251:38 | LL | reuse ::method { self.0 } | ------ ^^^^^^ expected `&F`, found `&S` @@ -218,28 +230,25 @@ LL | reuse ::method { self.0 } = note: expected reference `&wrong_return_type::F` found reference `&wrong_return_type::S` note: method defined here - --> $DIR/self-mapping-output.rs:235:12 + --> $DIR/self-mapping-output.rs:232:12 | LL | fn method(&self) -> Self; | ^^^^^^ ---- error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:254:29 + --> $DIR/self-mapping-output.rs:251:29 | LL | reuse ::method { self.0 } | ^^^^^^ expected `S`, found `F` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:258:29 + --> $DIR/self-mapping-output.rs:255:29 | LL | reuse ::r#static; - | ^^^^^^^^ - | | - | expected `W`, found `F` - | expected `wrong_return_type::W` because of return type + | ^^^^^^^^ expected `S`, found `F` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:261:37 + --> $DIR/self-mapping-output.rs:258:37 | LL | reuse ::raw_S { self.0 } | ----- ^^^^^^ expected `&F`, found `&S` @@ -249,13 +258,13 @@ LL | reuse ::raw_S { self.0 } = note: expected reference `&wrong_return_type::F` found reference `&wrong_return_type::S` note: method defined here - --> $DIR/self-mapping-output.rs:237:12 + --> $DIR/self-mapping-output.rs:234:12 | LL | fn raw_S(&self) -> S { S } | ^^^^^ ----- error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:266:38 + --> $DIR/self-mapping-output.rs:263:38 | LL | reuse ::method { self.0 } | ------ ^^^^^^ expected `&F`, found `&S` @@ -266,28 +275,25 @@ LL | reuse ::method { self.0 } = note: expected reference `&wrong_return_type::F` found reference `&wrong_return_type::S` note: method defined here - --> $DIR/self-mapping-output.rs:235:12 + --> $DIR/self-mapping-output.rs:232:12 | LL | fn method(&self) -> Self; | ^^^^^^ ---- error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:266:29 + --> $DIR/self-mapping-output.rs:263:29 | LL | reuse ::method { self.0 } | ^^^^^^ expected `S`, found `F` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:270:29 + --> $DIR/self-mapping-output.rs:267:29 | LL | reuse ::r#static; - | ^^^^^^^^ - | | - | expected `W`, found `F` - | expected `wrong_return_type::W` because of return type + | ^^^^^^^^ expected `S`, found `F` error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:273:37 + --> $DIR/self-mapping-output.rs:270:37 | LL | reuse ::raw_S { self.0 } | ----- ^^^^^^ expected `&F`, found `&S` @@ -297,13 +303,13 @@ LL | reuse ::raw_S { self.0 } = note: expected reference `&wrong_return_type::F` found reference `&wrong_return_type::S` note: method defined here - --> $DIR/self-mapping-output.rs:237:12 + --> $DIR/self-mapping-output.rs:234:12 | LL | fn raw_S(&self) -> S { S } | ^^^^^ ----- error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:299:31 + --> $DIR/self-mapping-output.rs:296:31 | LL | reuse Trait::method { F } | ------ ^ expected `&S`, found `&F` @@ -314,13 +320,13 @@ LL | reuse Trait::method { F } = note: expected reference `&wrong_target_expression::S` found reference `&wrong_target_expression::F` note: method defined here - --> $DIR/self-mapping-output.rs:280:12 + --> $DIR/self-mapping-output.rs:277:12 | LL | fn method(&self) -> Self; | ^^^^^^ ---- error[E0308]: mismatched types - --> $DIR/self-mapping-output.rs:308:31 + --> $DIR/self-mapping-output.rs:304:31 | LL | reuse Trait::method { F } | ------ ^ expected `&S`, found `&F` @@ -331,114 +337,36 @@ LL | reuse Trait::method { F } = note: expected reference `&wrong_target_expression::S` found reference `&wrong_target_expression::F` note: method defined here - --> $DIR/self-mapping-output.rs:280:12 + --> $DIR/self-mapping-output.rs:277:12 | LL | fn method(&self) -> Self; | ^^^^^^ ---- error[E0616]: field `0` of struct `private::W` is private - --> $DIR/self-mapping-output.rs:334:36 + --> $DIR/self-mapping-output.rs:330:36 | LL | reuse Trait::method { self.0 } | ^ private field error[E0616]: field `0` of struct `private::W` is private - --> $DIR/self-mapping-output.rs:340:35 + --> $DIR/self-mapping-output.rs:335:35 | LL | reuse Trait::raw_S { self.0 } | ^ private field error[E0616]: field `0` of struct `private::W` is private - --> $DIR/self-mapping-output.rs:345:36 + --> $DIR/self-mapping-output.rs:340:36 | LL | reuse Trait::method { self.0 } | ^ private field error[E0616]: field `0` of struct `private::W` is private - --> $DIR/self-mapping-output.rs:350:35 + --> $DIR/self-mapping-output.rs:345:35 | LL | reuse Trait::raw_S { self.0 } | ^ private field -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:19:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - = note: `#[warn(unconditional_recursion)]` on by default - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:47:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:83:34 - | -LL | reuse Trait::<'a, T, N>::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:112:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:144:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:302:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -warning: function cannot return without recursing - --> $DIR/self-mapping-output.rs:337:22 - | -LL | reuse Trait::r#static; - | ^^^^^^^^ - | | - | cannot return without recursing - | recursive call site - | - = help: a `loop` may express intention better if this is on purpose - -error: aborting due to 29 previous errors; 7 warnings emitted +error: aborting due to 31 previous errors Some errors have detailed explanations: E0063, E0283, E0308, E0609, E0616. For more information about an error, try `rustc --explain E0063`. diff --git a/tests/ui/delegation/self-mapping-static-fn-no-target-expr.rs b/tests/ui/delegation/self-mapping-static-fn-no-target-expr.rs new file mode 100644 index 0000000000000..f503813b5dfdc --- /dev/null +++ b/tests/ui/delegation/self-mapping-static-fn-no-target-expr.rs @@ -0,0 +1,26 @@ +//@ check-pass + +#![feature(fn_delegation)] + +pub trait Idx { + fn new(idx: usize) -> Self; + + fn index(self) -> usize; +} + +struct DefIndex(usize); +impl Idx for DefIndex { + fn new(idx: usize) -> Self { DefIndex(idx) } + fn index(self) -> usize { self.0 } +} + +struct LocalDefId { + index: DefIndex +} + +impl Idx for LocalDefId { + reuse ::new; + reuse Idx::index { self.index } +} + +fn main() {}