Skip to content

Commit 8550f15

Browse files
borsbors
committed
Auto merge of #115281 - GuillaumeGomez:rollup-yr05a54, r=GuillaumeGomez
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
2 parents 668bf8c + 84891c2 commit 8550f15

File tree

8 files changed

+21
-18
lines changed

8 files changed

+21
-18
lines changed

Diff for: ‎compiler/rustc_interface/src/tests.rs

+1
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,7 @@ fn test_unstable_options_tracking_hash() {
807807
tracked!(no_jump_tables, true);
808808
tracked!(no_link, true);
809809
tracked!(no_profiler_runtime, true);
810+
tracked!(no_trait_vptr, true);
810811
tracked!(no_unique_section_names, true);
811812
tracked!(oom, OomStrategy::Panic);
812813
tracked!(osx_rpath_install_name, true);

Diff for: ‎compiler/rustc_session/src/options.rs

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

Diff for: ‎compiler/rustc_trait_selection/src/traits/vtable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ fn prepare_vtable_segments_inner<'tcx, T>(
152152
while let Some((inner_most_trait_ref, emit_vptr, mut siblings)) = stack.pop() {
153153
segment_visitor(VtblSegment::TraitOwnEntries {
154154
trait_ref: inner_most_trait_ref,
155-
emit_vptr,
155+
emit_vptr: emit_vptr && !tcx.sess.opts.unstable_opts.no_trait_vptr,
156156
})?;
157157

158158
// If we've emitted (fed to `segment_visitor`) a trait that has methods present in the vtable,

Diff for: ‎src/bootstrap/config/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn download_ci_llvm() {
3535
));
3636
}
3737

38-
// FIXME(ozkanonur): extend scope of the test
38+
// FIXME(onur-ozkan): extend scope of the test
3939
// refs:
4040
// - https://github.com/rust-lang/rust/issues/109120
4141
// - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487

Diff for: ‎src/librustdoc/html/static/css/themes/ayu.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Original by Dempfi (https://github.com/dempfi/ayu)
3131
--codeblock-error-color: rgba(255, 0, 0, .5);
3232
--codeblock-ignore-hover-color: rgb(255, 142, 0);
3333
--codeblock-ignore-color: rgba(255, 142, 0, .6);
34-
--warning-border-color: rgb(255, 142, 0);
34+
--warning-border-color: #ff8e00;
3535
--type-link-color: #ffa0a5;
3636
--trait-link-color: #39afd7;
3737
--assoc-item-link-color: #39afd7;
@@ -96,8 +96,8 @@ Original by Dempfi (https://github.com/dempfi/ayu)
9696
--codeblock-link-background: #333;
9797
--scrape-example-toggle-line-background: #999;
9898
--scrape-example-toggle-line-hover-background: #c5c5c5;
99-
--scrape-example-code-line-highlight: rgb(91, 59, 1);
100-
--scrape-example-code-line-highlight-focus: rgb(124, 75, 15);
99+
--scrape-example-code-line-highlight: #5b3b01;
100+
--scrape-example-code-line-highlight-focus: #7c4b0f;
101101
--scrape-example-help-border-color: #aaa;
102102
--scrape-example-help-color: #eee;
103103
--scrape-example-help-hover-border-color: #fff;

Diff for: ‎src/librustdoc/html/static/css/themes/dark.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
--codeblock-error-color: rgba(255, 0, 0, .5);
2727
--codeblock-ignore-hover-color: rgb(255, 142, 0);
2828
--codeblock-ignore-color: rgba(255, 142, 0, .6);
29-
--warning-border-color: rgb(255, 142, 0);
29+
--warning-border-color: #ff8e00;
3030
--type-link-color: #2dbfb8;
3131
--trait-link-color: #b78cf2;
3232
--assoc-item-link-color: #d2991d;
@@ -69,7 +69,7 @@
6969
--test-arrow-color: #dedede;
7070
--test-arrow-background-color: rgba(78, 139, 202, 0.2);
7171
--test-arrow-hover-color: #dedede;
72-
--test-arrow-hover-background-color: rgb(78, 139, 202);
72+
--test-arrow-hover-background-color: #4e8bca;
7373
--target-background-color: #494a3d;
7474
--target-border-color: #bb7410;
7575
--kbd-color: #000;
@@ -87,12 +87,12 @@
8787
--crate-search-hover-border: #2196f3;
8888
--src-sidebar-background-selected: #333;
8989
--src-sidebar-background-hover: #444;
90-
--table-alt-row-background-color: #2A2A2A;
90+
--table-alt-row-background-color: #2a2a2a;
9191
--codeblock-link-background: #333;
9292
--scrape-example-toggle-line-background: #999;
9393
--scrape-example-toggle-line-hover-background: #c5c5c5;
94-
--scrape-example-code-line-highlight: rgb(91, 59, 1);
95-
--scrape-example-code-line-highlight-focus: rgb(124, 75, 15);
94+
--scrape-example-code-line-highlight: #5b3b01;
95+
--scrape-example-code-line-highlight-focus: #7c4b0f;
9696
--scrape-example-help-border-color: #aaa;
9797
--scrape-example-help-color: #eee;
9898
--scrape-example-help-hover-border-color: #fff;

Diff for: ‎src/librustdoc/html/static/css/themes/light.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
--settings-input-border-color: #717171;
66
--settings-button-color: #000;
77
--settings-button-border-focus: #717171;
8-
--sidebar-background-color: #F5F5F5;
9-
--sidebar-background-color-hover: #E0E0E0;
10-
--code-block-background-color: #F5F5F5;
8+
--sidebar-background-color: #f5f5f5;
9+
--sidebar-background-color-hover: #e0e0e0;
10+
--code-block-background-color: #f5f5f5;
1111
--scrollbar-track-background-color: #dcdcdc;
1212
--scrollbar-thumb-background-color: rgba(36, 37, 39, 0.6);
1313
--scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9;
@@ -26,7 +26,7 @@
2626
--codeblock-error-color: rgba(255, 0, 0, .5);
2727
--codeblock-ignore-hover-color: rgb(255, 142, 0);
2828
--codeblock-ignore-color: rgba(255, 142, 0, .6);
29-
--warning-border-color: rgb(255, 142, 0);
29+
--warning-border-color: #ff8e00;
3030
--type-link-color: #ad378a;
3131
--trait-link-color: #6e4fc9;
3232
--assoc-item-link-color: #3873ad;
@@ -47,7 +47,7 @@
4747
--search-tab-button-not-selected-border-top-color: #e6e6e6;
4848
--search-tab-button-not-selected-background: #e6e6e6;
4949
--search-tab-button-selected-border-top-color: #0089ff;
50-
--search-tab-button-selected-background: #ffffff;
50+
--search-tab-button-selected-background: #fff;
5151
--stab-background-color: #fff5d6;
5252
--stab-code-color: #000;
5353
--code-highlight-kw-color: #8959a8;
@@ -84,7 +84,7 @@
8484
--crate-search-hover-border: #717171;
8585
--src-sidebar-background-selected: #fff;
8686
--src-sidebar-background-hover: #e0e0e0;
87-
--table-alt-row-background-color: #F5F5F5;
87+
--table-alt-row-background-color: #f5f5f5;
8888
--codeblock-link-background: #eee;
8989
--scrape-example-toggle-line-background: #ccc;
9090
--scrape-example-toggle-line-hover-background: #999;

Diff for: ‎triagebot.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ libs = [
616616
bootstrap = [
617617
"@Mark-Simulacrum",
618618
"@albertlarsan68",
619-
"@ozkanonur",
619+
"@onur-ozkan",
620620
"@clubby789",
621621
]
622622
infra-ci = [
@@ -749,4 +749,4 @@ style-team = [
749749
"/src/tools/rustdoc-themes" = ["rustdoc"]
750750
"/src/tools/tidy" = ["bootstrap"]
751751
"/src/tools/x" = ["bootstrap"]
752-
"/src/tools/rustdoc-gui-test" = ["bootstrap", "@ozkanonur"]
752+
"/src/tools/rustdoc-gui-test" = ["bootstrap", "@onur-ozkan"]

0 commit comments

Comments
 (0)