Rollup merge of #129796 - GuillaumeGomez:unify-code-examples, r=notriddle

Unify scraped examples with other code examples
Fixes#129763.
This first PR both fixes#129763 but also unifies buttons display for code examples:
![image](https://github.com/user-attachments/assets/c8475945-dcc3-4c25-8d7d-1659f85301c8)
You can test it [here](https://rustdoc.crud.net/imperio/unify-code-examples/doc/scrape_examples/fn.test.html) and [here](https://rustdoc.crud.net/imperio/unify-code-examples/doc/scrape_examples/fn.test_many.html).
I'm planning to send a follow-up to make the buttons generated in JS directly (or I can do it in this PR directly if you prefer).
cc ```@willcrichton```
r? ```@notriddle```

Author: matthiaskrgr

src/librustdoc/html/render/mod.rs

@@ -2506,28 +2506,6 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
 let needs_expansion = line_max - line_min > NUM_VISIBLE_LINES;
 let locations_encoded = serde_json::to_string(&line_ranges).unwrap();
 
-write!(
-&mut w,
-"<div class=\"scraped-example {expanded_cls}\" data-locs=\"{locations}\">\
- <div class=\"scraped-example-title\">\
- {name} (<a href=\"{url}\">{title}</a>)\
- </div>\
- <div class=\"code-wrapper\">",
- expanded_cls = if needs_expansion {""} else {"expanded"},
- name = call_data.display_name,
- url = init_url,
- title = init_title,
-// The locations are encoded as a data attribute, so they can be read
-// later by the JS for interactions.
- locations = Escape(&locations_encoded)
-)
-.unwrap();
-
-if line_ranges.len() > 1{
- w.write_str(r#"<button class="prev">&pr;</button> <button class="next">&sc;</button>"#)
-.unwrap();
-}
-
 // Look for the example file in the source map if it exists, otherwise return a dummy span
 let file_span = (|| {
 let source_map = tcx.sess.source_map();
@@ -2558,9 +2536,16 @@ fn render_call_locations<W: fmt::Write>(mut w: W, cx: &mut Context<'_>, item: &c
  cx,
 &cx.root_path(),
  highlight::DecorationInfo(decoration_info),
- sources::SourceContext::Embedded{offset: line_min, needs_expansion },
+ sources::SourceContext::Embedded(sources::ScrapedInfo{
+needs_prev_next_buttons: line_ranges.len() > 1,
+ needs_expansion,
+offset: line_min,
+name:&call_data.display_name,
+url: init_url,
+title: init_title,
+locations: locations_encoded,
+}),
 );
- w.write_str("</div></div>").unwrap();
 
 true
 };

src/librustdoc/html/sources.rs

@@ -290,9 +290,34 @@ where
 }
 }
 
-pub(crate)enumSourceContext{
+pub(crate)structScrapedInfo<'a>{
+pub(crate)offset:usize,
+pub(crate)needs_prev_next_buttons:bool,
+pub(crate)name:&'astr,
+pub(crate)url:&'astr,
+pub(crate)title:&'astr,
+pub(crate)locations:String,
+pub(crate)needs_expansion:bool,
+}
+
+#[derive(Template)]
+#[template(path = "scraped_source.html")]
+structScrapedSource<'a,Code: std::fmt::Display>{
+info:ScrapedInfo<'a>,
+lines:RangeInclusive<usize>,
+code_html:Code,
+}
+
+#[derive(Template)]
+#[template(path = "source.html")]
+structSource<Code: std::fmt::Display>{
+lines:RangeInclusive<usize>,
+code_html:Code,
+}
+
+pub(crate)enumSourceContext<'a>{
 Standalone,
-Embedded{offset:usize,needs_expansion:bool},
+Embedded(ScrapedInfo<'a>),
 }
 
 /// Wrapper struct to render the source code of a file. This will do things like
@@ -304,23 +329,8 @@ pub(crate) fn print_src(
 context:&Context<'_>,
 root_path:&str,
 decoration_info: highlight::DecorationInfo,
-source_context:SourceContext,
+source_context:SourceContext<'_>,
 ){
-#[derive(Template)]
-#[template(path = "source.html")]
-structSource<Code: std::fmt::Display>{
-embedded:bool,
-needs_expansion:bool,
-lines:RangeInclusive<usize>,
-code_html:Code,
-}
-let lines = s.lines().count();
-let(embedded, needs_expansion, lines) = match source_context {
-SourceContext::Standalone => (false,false,1..=lines),
-SourceContext::Embedded{ offset, needs_expansion } => {
-(true, needs_expansion,(1 + offset)..=(lines + offset))
-}
-};
 let current_href = context
 .href_from_span(clean::Span::new(file_span),false)
 .expect("only local crates should have sources emitted");
@@ -333,5 +343,14 @@ pub(crate) fn print_src(
 );
 Ok(())
 });
-Source{ embedded, needs_expansion, lines,code_html: code }.render_into(&mut writer).unwrap();
+let lines = s.lines().count();
+match source_context {
+SourceContext::Standalone => {
+Source{lines:(1..=lines),code_html: code }.render_into(&mut writer).unwrap()
+}
+SourceContext::Embedded(info) => {
+let lines = (1 + info.offset)..=(lines + info.offset);
+ScrapedSource{ info, lines,code_html: code }.render_into(&mut writer).unwrap();
+}
+};
 }

src/librustdoc/html/static/css/noscript.css

@@ -59,6 +59,8 @@ nav.sub {
 --copy-path-button-color:#999;
 --copy-path-img-filter:invert(50%);
 --copy-path-img-hover-filter:invert(35%);
+--code-example-button-color:#7f7f7f;
+--code-example-button-hover-color:#595959;
 --codeblock-error-hover-color:rgb(255,0,0);
 --codeblock-error-color:rgba(255,0,0,.5);
 --codeblock-ignore-hover-color:rgb(255,142,0);
@@ -162,6 +164,8 @@ nav.sub {
 --copy-path-button-color:#999;
 --copy-path-img-filter:invert(50%);
 --copy-path-img-hover-filter:invert(65%);
+--code-example-button-color:#7f7f7f;
+--code-example-button-hover-color:#a5a5a5;
 --codeblock-error-hover-color:rgb(255,0,0);
 --codeblock-error-color:rgba(255,0,0,.5);
 --codeblock-ignore-hover-color:rgb(255,142,0);