mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #115281 - GuillaumeGomez:rollup-yr05a54, r=GuillaumeGomez

Browse Source 
Rollup of 3 pull requests

Successful merges:

 - #114974 (Add an (perma-)unstable option to disable vtable vptr)
 - #115261 (replace outdated github username 'ozkanonur')
 - #115266 (Unify CSS color formats a bit more)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2023-08-27 19:37:21 +00:00
commit 8550f15e14
8 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_interface/src/tests.rs
View File

@ -807,6 +807,7 @@ fn test_unstable_options_tracking_hash() {
tracked!(no_jump_tables, true); tracked!(no_jump_tables, true);
tracked!(no_link, true); tracked!(no_link, true);
tracked!(no_profiler_runtime, true); tracked!(no_profiler_runtime, true);
tracked!(no_trait_vptr, true);
tracked!(no_unique_section_names, true); tracked!(no_unique_section_names, true);
tracked!(oom, OomStrategy::Panic); tracked!(oom, OomStrategy::Panic);
tracked!(osx_rpath_install_name, true); tracked!(osx_rpath_install_name, true);

2
compiler/rustc_session/src/options.rs
View File

@ -1631,6 +1631,8 @@ options! {
"run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)"), "run LLVM in non-parallel mode (while keeping codegen-units and ThinLTO)"),
no_profiler_runtime: bool = (false, parse_no_flag, [TRACKED], no_profiler_runtime: bool = (false, parse_no_flag, [TRACKED],
"prevent automatic injection of the profiler_builtins crate"), "prevent automatic injection of the profiler_builtins crate"),
no_trait_vptr: bool = (false, parse_no_flag, [TRACKED],
"disable generation of trait vptr in vtable for upcasting"),
no_unique_section_names: bool = (false, parse_bool, [TRACKED], no_unique_section_names: bool = (false, parse_bool, [TRACKED],
"do not use unique names for text and data sections when -Z function-sections is used"), "do not use unique names for text and data sections when -Z function-sections is used"),
normalize_docs: bool = (false, parse_bool, [TRACKED], normalize_docs: bool = (false, parse_bool, [TRACKED],

2
compiler/rustc_trait_selection/src/traits/vtable.rs
View File

@ -152,7 +152,7 @@ fn prepare_vtable_segments_inner<'tcx, T>(
while let Some((inner_most_trait_ref, emit_vptr, mut siblings)) = stack.pop() { while let Some((inner_most_trait_ref, emit_vptr, mut siblings)) = stack.pop() {
segment_visitor(VtblSegment::TraitOwnEntries { segment_visitor(VtblSegment::TraitOwnEntries {
trait_ref: inner_most_trait_ref, trait_ref: inner_most_trait_ref,
emit_vptr, emit_vptr: emit_vptr && !tcx.sess.opts.unstable_opts.no_trait_vptr,
})?; })?;
// If we've emitted (fed to `segment_visitor`) a trait that has methods present in the vtable, // If we've emitted (fed to `segment_visitor`) a trait that has methods present in the vtable,

2
src/bootstrap/config/tests.rs
View File

@ -35,7 +35,7 @@ fn download_ci_llvm() {
)); ));
} }
// FIXME(ozkanonur): extend scope of the test // FIXME(onur-ozkan): extend scope of the test
// refs: // refs:
// - https://github.com/rust-lang/rust/issues/109120 // - https://github.com/rust-lang/rust/issues/109120
// - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487

6
src/librustdoc/html/static/css/themes/ayu.css
View File

@ -31,7 +31,7 @@ Original by Dempfi (https://github.com/dempfi/ayu)
--codeblock-error-color: rgba(255, 0, 0, .5); --codeblock-error-color: rgba(255, 0, 0, .5);
--codeblock-ignore-hover-color: rgb(255, 142, 0); --codeblock-ignore-hover-color: rgb(255, 142, 0);
--codeblock-ignore-color: rgba(255, 142, 0, .6); --codeblock-ignore-color: rgba(255, 142, 0, .6);
--warning-border-color: rgb(255, 142, 0); --warning-border-color: #ff8e00;
--type-link-color: #ffa0a5; --type-link-color: #ffa0a5;
--trait-link-color: #39afd7; --trait-link-color: #39afd7;
--assoc-item-link-color: #39afd7; --assoc-item-link-color: #39afd7;
@ -96,8 +96,8 @@ Original by Dempfi (https://github.com/dempfi/ayu)
--codeblock-link-background: #333; --codeblock-link-background: #333;
--scrape-example-toggle-line-background: #999; --scrape-example-toggle-line-background: #999;
--scrape-example-toggle-line-hover-background: #c5c5c5; --scrape-example-toggle-line-hover-background: #c5c5c5;
--scrape-example-code-line-highlight: rgb(91, 59, 1); --scrape-example-code-line-highlight: #5b3b01;
--scrape-example-code-line-highlight-focus: rgb(124, 75, 15); --scrape-example-code-line-highlight-focus: #7c4b0f;
--scrape-example-help-border-color: #aaa; --scrape-example-help-border-color: #aaa;
--scrape-example-help-color: #eee; --scrape-example-help-color: #eee;
--scrape-example-help-hover-border-color: #fff; --scrape-example-help-hover-border-color: #fff;

10
src/librustdoc/html/static/css/themes/dark.css
View File

@ -26,7 +26,7 @@
--codeblock-error-color: rgba(255, 0, 0, .5); --codeblock-error-color: rgba(255, 0, 0, .5);
--codeblock-ignore-hover-color: rgb(255, 142, 0); --codeblock-ignore-hover-color: rgb(255, 142, 0);
--codeblock-ignore-color: rgba(255, 142, 0, .6); --codeblock-ignore-color: rgba(255, 142, 0, .6);
--warning-border-color: rgb(255, 142, 0); --warning-border-color: #ff8e00;
--type-link-color: #2dbfb8; --type-link-color: #2dbfb8;
--trait-link-color: #b78cf2; --trait-link-color: #b78cf2;
--assoc-item-link-color: #d2991d; --assoc-item-link-color: #d2991d;
@ -69,7 +69,7 @@
--test-arrow-color: #dedede; --test-arrow-color: #dedede;
--test-arrow-background-color: rgba(78, 139, 202, 0.2); --test-arrow-background-color: rgba(78, 139, 202, 0.2);
--test-arrow-hover-color: #dedede; --test-arrow-hover-color: #dedede;
--test-arrow-hover-background-color: rgb(78, 139, 202); --test-arrow-hover-background-color: #4e8bca;
--target-background-color: #494a3d; --target-background-color: #494a3d;
--target-border-color: #bb7410; --target-border-color: #bb7410;
--kbd-color: #000; --kbd-color: #000;
@ -87,12 +87,12 @@
--crate-search-hover-border: #2196f3; --crate-search-hover-border: #2196f3;
--src-sidebar-background-selected: #333; --src-sidebar-background-selected: #333;
--src-sidebar-background-hover: #444; --src-sidebar-background-hover: #444;
--table-alt-row-background-color: #2A2A2A; --table-alt-row-background-color: #2a2a2a;
--codeblock-link-background: #333; --codeblock-link-background: #333;
--scrape-example-toggle-line-background: #999; --scrape-example-toggle-line-background: #999;
--scrape-example-toggle-line-hover-background: #c5c5c5; --scrape-example-toggle-line-hover-background: #c5c5c5;
--scrape-example-code-line-highlight: rgb(91, 59, 1); --scrape-example-code-line-highlight: #5b3b01;
--scrape-example-code-line-highlight-focus: rgb(124, 75, 15); --scrape-example-code-line-highlight-focus: #7c4b0f;
--scrape-example-help-border-color: #aaa; --scrape-example-help-border-color: #aaa;
--scrape-example-help-color: #eee; --scrape-example-help-color: #eee;
--scrape-example-help-hover-border-color: #fff; --scrape-example-help-hover-border-color: #fff;

12
src/librustdoc/html/static/css/themes/light.css
View File

@ -5,9 +5,9 @@
--settings-input-border-color: #717171; --settings-input-border-color: #717171;
--settings-button-color: #000; --settings-button-color: #000;
--settings-button-border-focus: #717171; --settings-button-border-focus: #717171;
--sidebar-background-color: #F5F5F5; --sidebar-background-color: #f5f5f5;
--sidebar-background-color-hover: #E0E0E0; --sidebar-background-color-hover: #e0e0e0;
--code-block-background-color: #F5F5F5; --code-block-background-color: #f5f5f5;
--scrollbar-track-background-color: #dcdcdc; --scrollbar-track-background-color: #dcdcdc;
--scrollbar-thumb-background-color: rgba(36, 37, 39, 0.6); --scrollbar-thumb-background-color: rgba(36, 37, 39, 0.6);
--scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9; --scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9;
@ -26,7 +26,7 @@
--codeblock-error-color: rgba(255, 0, 0, .5); --codeblock-error-color: rgba(255, 0, 0, .5);
--codeblock-ignore-hover-color: rgb(255, 142, 0); --codeblock-ignore-hover-color: rgb(255, 142, 0);
--codeblock-ignore-color: rgba(255, 142, 0, .6); --codeblock-ignore-color: rgba(255, 142, 0, .6);
--warning-border-color: rgb(255, 142, 0); --warning-border-color: #ff8e00;
--type-link-color: #ad378a; --type-link-color: #ad378a;
--trait-link-color: #6e4fc9; --trait-link-color: #6e4fc9;
--assoc-item-link-color: #3873ad; --assoc-item-link-color: #3873ad;
@ -47,7 +47,7 @@
--search-tab-button-not-selected-border-top-color: #e6e6e6; --search-tab-button-not-selected-border-top-color: #e6e6e6;
--search-tab-button-not-selected-background: #e6e6e6; --search-tab-button-not-selected-background: #e6e6e6;
--search-tab-button-selected-border-top-color: #0089ff; --search-tab-button-selected-border-top-color: #0089ff;
--search-tab-button-selected-background: #ffffff; --search-tab-button-selected-background: #fff;
--stab-background-color: #fff5d6; --stab-background-color: #fff5d6;
--stab-code-color: #000; --stab-code-color: #000;
--code-highlight-kw-color: #8959a8; --code-highlight-kw-color: #8959a8;
@ -84,7 +84,7 @@
--crate-search-hover-border: #717171; --crate-search-hover-border: #717171;
--src-sidebar-background-selected: #fff; --src-sidebar-background-selected: #fff;
--src-sidebar-background-hover: #e0e0e0; --src-sidebar-background-hover: #e0e0e0;
--table-alt-row-background-color: #F5F5F5; --table-alt-row-background-color: #f5f5f5;
--codeblock-link-background: #eee; --codeblock-link-background: #eee;
--scrape-example-toggle-line-background: #ccc; --scrape-example-toggle-line-background: #ccc;
--scrape-example-toggle-line-hover-background: #999; --scrape-example-toggle-line-hover-background: #999;

4
triagebot.toml
View File

@ -616,7 +616,7 @@ libs = [
bootstrap = [ bootstrap = [
"@Mark-Simulacrum", "@Mark-Simulacrum",
"@albertlarsan68", "@albertlarsan68",
"@ozkanonur", "@onur-ozkan",
"@clubby789", "@clubby789",
] ]
infra-ci = [ infra-ci = [
@ -749,4 +749,4 @@ style-team = [
"/src/tools/rustdoc-themes" = ["rustdoc"] "/src/tools/rustdoc-themes" = ["rustdoc"]
"/src/tools/tidy" = ["bootstrap"] "/src/tools/tidy" = ["bootstrap"]
"/src/tools/x" = ["bootstrap"] "/src/tools/x" = ["bootstrap"]
"/src/tools/rustdoc-gui-test" = ["bootstrap", "@ozkanonur"] "/src/tools/rustdoc-gui-test" = ["bootstrap", "@onur-ozkan"]