Finish rebasing

Author: albertlarsan68

Cargo.lock

@@ -5908,7 +5908,7 @@ dependencies = [
  "num-traits",
  "rustdoc-json-types",
  "serde_json",
- "syn",
+ "syn 1.0.109",
  "tidy",
 ]
 

src/bootstrap/src/core/build_steps/doc.rs

@@ -967,11 +967,12 @@ impl Step for UnstableBookGen {
         let target = self.target;
         let host = builder.build.build;
 
-        builder.ensure(Std {
-            stage: builder.top_stage,
-            target: host,
-            format: DocumentationFormat::JSON,
-        });
+        builder.ensure(Std::new(
+            builder.top_stage,
+            self.target,
+            builder,
+            DocumentationFormat::JSON,
+        ));
 
         builder.info(&format!("Generating unstable book md files ({target})"));
         let out = builder.md_doc_out(target).join("unstable-book");

src/tools/unstable-book-gen/src/main.rs

@@ -111,9 +111,13 @@ pub fn load_rustdoc_json_metadata(doc_dir: &Path) -> HashMap<String, Vec<(String
                 continue;
             }
             let unstable_feature = item.attrs.iter().find_map(|attr: &String| {
-                let Ok(parseable) = syn::Attribute::parse_outer.parse_str(attr) else {return None;};
+                let Ok(parseable) = syn::Attribute::parse_outer.parse_str(attr) else {
+                    return None;
+                };
                 for parsed in parseable {
-                    let Some(ident) = parsed.path.get_ident() else {continue;};
+                    let Some(ident) = parsed.path.get_ident() else {
+                        continue;
+                    };
                     // Make sure this is an `unstable` attribute.
                     if !is_ident(ident, "unstable") {
                         continue;