diff --git a/build.sh b/build.sh index bdd52c6..3d3d6a7 100755 --- a/build.sh +++ b/build.sh @@ -9,11 +9,6 @@ cp index.html "$root/www-root" # use a higher depth because bootstrap might be broken with depth 1? if [ ! -d 'rust' ]; then git clone --depth 50 https://github.com/rust-lang/rust.git - pushd rust - git ls-files -z -- ':(glob)library/**/*.rs' \ - | xargs -0 sed -i'' -E 's@^[[:space:]]*#!?\[doc\(cfg.*$@// & // commented out for std.noratrieb.dev@' - git apply ../disable-cfg-doc.patch - popd fi cd rust @@ -48,9 +43,7 @@ for target in "${targets[@]}"; do --document-hidden-items \ --html-before-content=$root/before.html \ --extend-css=$root/style.css \ - --cap-lints=allow \ - --generate-link-to-definition \ - --generate-macro-expansion" + --cap-lints=allow" ./x doc library --target "$target" --stage 1 diff --git a/disable-cfg-doc.patch b/disable-cfg-doc.patch deleted file mode 100644 index 1f08c7f..0000000 --- a/disable-cfg-doc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs -index 375f833831..942dba29e6 100644 ---- a/src/librustdoc/core.rs -+++ b/src/librustdoc/core.rs -@@ -202,7 +202,7 @@ pub(crate) fn create_config( - diagnostic_width, - libs, - externs, -- mut cfgs, -+ cfgs, - check_cfgs, - codegen_options, - unstable_opts, -@@ -220,7 +220,7 @@ pub(crate) fn create_config( - render_options: &RenderOptions, - ) -> rustc_interface::Config { - // Add the doc cfg into the doc build. -- cfgs.push("doc".to_string()); -+ // cfgs.push("doc".to_string()); - - // By default, rustdoc ignores all lints. - // Specifically unblock lints relevant to documentation or the lint machinery itself.