From 33959d52342e96f199678f72bdafad6a47544e44 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:10 +0200 Subject: Adding debian version 1.68.2+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/patches/d-bootstrap-cargo-doc-paths.patch | 133 +++++++++++++++++++++++ 1 file changed, 133 insertions(+) (limited to 'debian/patches/d-bootstrap-cargo-doc-paths.patch') diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index 235c93a50..baba25534 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -241,3 +241,136 @@ index a22dc5f..c8d521a 100644 if is_exception(file, &target_pretty_path) { report.links_ignored_exception += 1; } else { +Index: rust/compiler/rustc_error_codes/src/error_codes/E0462.md +=================================================================== +--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0462.md ++++ rust/compiler/rustc_error_codes/src/error_codes/E0462.md +@@ -26,7 +26,7 @@ prefer `staticlib` for linking with C pr + `crate_type`s in [this section of the Reference](../reference/linkage.html). + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling the crate as a `rlib` or `dylib`; formats suitable for Rust + linking. +Index: rust/compiler/rustc_error_codes/src/error_codes/E0460.md +=================================================================== +--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0460.md ++++ rust/compiler/rustc_error_codes/src/error_codes/E0460.md +@@ -68,4 +68,4 @@ This error can be fixed by: + * Recompiling crate `a` so that both crate `b` and `main` have a uniform + version to depend on. + +-[Cargo]: ../cargo/index.html ++[Cargo]: ../../cargo-doc/doc/index.html +Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md +=================================================================== +--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0514.md ++++ rust/compiler/rustc_error_codes/src/error_codes/E0514.md +@@ -27,7 +27,7 @@ the compiler cannot be sure about *how* + versions, and therefore this error occurs. + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager and ++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager and + [Rustup](https://rust-lang.github.io/rustup/), the Rust toolchain installer, + automatically fixing this issue. + * Recompiling the crates with a uniform `rustc` version. +Index: rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md +=================================================================== +--- rust.orig/src/doc/unstable-book/src/compiler-flags/branch-protection.md ++++ rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md +@@ -15,4 +15,4 @@ For example, `-Z branch-protection=bti,p + + Rust's standard library does not ship with BTI or pointer authentication enabled by default. + In Cargo projects the standard library can be recompiled with pointer authentication using the nightly +-[build-std](../../cargo/reference/unstable.html#build-std) feature. ++[build-std](../../../cargo-doc/doc/reference/unstable.html#build-std) feature. +Index: rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md +=================================================================== +--- rust.orig/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md ++++ rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md +@@ -39,7 +39,7 @@ It is strongly recommended to also enabl + + To enable CFG in the standard library, use the [cargo `-Z build-std` functionality][build-std] to recompile the standard library with the same configuration options as the main program. + +-[build-std]: ../../cargo/reference/unstable.html#build-std ++[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std + + For example: + ```cmd +Index: rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md +=================================================================== +--- rust.orig/src/doc/unstable-book/src/compiler-flags/sanitizer.md ++++ rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md +@@ -691,7 +691,7 @@ It is strongly recommended to combine sa + instrumented standard library, for example using [cargo `-Zbuild-std` + functionality][build-std]. + +-[build-std]: ../../cargo/reference/unstable.html#build-std ++[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std + + # Build scripts and procedural macros + +Index: rust/compiler/rustc_error_codes/src/error_codes/E0461.md +=================================================================== +--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0461.md ++++ rust/compiler/rustc_error_codes/src/error_codes/E0461.md +@@ -25,6 +25,6 @@ architectures. This issue also extends t + `std` is operating-system specific. + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling either crate so that they target a consistent target triple. +Index: rust/compiler/rustc_error_codes/src/error_codes/E0519.md +=================================================================== +--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0519.md ++++ rust/compiler/rustc_error_codes/src/error_codes/E0519.md +@@ -34,7 +34,7 @@ The above example compiles two crates wi + impossible for the compiler to distinguish between symbols (`pub` item names). + + This error can be fixed by: +- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically ++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically + fixing this issue. + * Recompiling the crate with different metadata (different name/ + `crate_type`). +Index: rust/src/doc/rustc/src/linker-plugin-lto.md +=================================================================== +--- rust.orig/src/doc/rustc/src/linker-plugin-lto.md ++++ rust/src/doc/rustc/src/linker-plugin-lto.md +@@ -112,7 +112,7 @@ targeting Windows-like targets + This is fixed if you explicitly set the target, for example + `cargo build --target x86_64-pc-windows-msvc` + Without an explicit --target the flags will be passed to all compiler invocations (including build +-scripts and proc macros), see [cargo docs on rustflags](../cargo/reference/config.html#buildrustflags) ++scripts and proc macros), see [cargo docs on rustflags](../../cargo-doc/doc/reference/config.html#buildrustflags) + + If you have dependencies using the `cc` crate, you will need to set these + environment variables: +Index: rust/src/doc/rustc/src/platform-support/fuchsia.md +=================================================================== +--- rust.orig/src/doc/rustc/src/platform-support/fuchsia.md ++++ rust/src/doc/rustc/src/platform-support/fuchsia.md +@@ -870,7 +870,7 @@ ${SDK_PATH}/tools/${ARCH}/ffx debug conn + [Fuchsia]: https://fuchsia.dev/ + [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build + [rustup]: https://rustup.rs/ +-[cargo]: ../../cargo/index.html ++[cargo]: ../../../cargo-doc/doc/index.html + [Fuchsia SDK]: https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core + [overview of CML]: https://fuchsia.dev/fuchsia-src/concepts/components/v2/component_manifests + [reference for the file format]: https://fuchsia.dev/reference/cml +Index: rust/src/doc/rustc/src/targets/custom.md +=================================================================== +--- rust.orig/src/doc/rustc/src/targets/custom.md ++++ rust/src/doc/rustc/src/targets/custom.md +@@ -14,4 +14,4 @@ To see it for a different target, add th + rustc +nightly -Z unstable-options --target=wasm32-unknown-unknown --print target-spec-json + ``` + +-To use a custom target, see the (unstable) [`build-std` feature](../../cargo/reference/unstable.html#build-std) of `cargo`. ++To use a custom target, see the (unstable) [`build-std` feature](../../../cargo-doc/doc/reference/unstable.html#build-std) of `cargo`. -- cgit v1.2.3