proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-02-03 22:27:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update early-stage patches for 1.68.2+dfsg1

Browse Source
This commit is contained in:
Eric Long 2023-07-27 22:26:19 +08:00 committed by Fabian Grünbichler
parent b24c441480
commit 9809ce192a
4 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
debian/patches/d-0000-ignore-removed-submodules.patch vendored
View File

@ -3,22 +3,22 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
Subject: d-0000-ignore-removed-submodules
---
Cargo.toml | 15 ---------------
Cargo.toml | 17 -----------------
src/bootstrap/bootstrap.py | 4 ----
src/bootstrap/builder.rs | 17 +----------------
src/bootstrap/builder.rs | 18 +-----------------
src/bootstrap/doc.rs | 1 -
src/bootstrap/test.rs | 12 +-----------
src/tools/clippy/Cargo.toml | 5 -----
src/tools/rust-analyzer/Cargo.toml | 11 ++++++++++-
src/tools/rustfmt/Cargo.toml | 5 -----
src/tools/tidy/src/deps.rs | 2 +-
9 files changed, 13 insertions(+), 59 deletions(-)
src/tools/tidy/src/deps.rs | 4 +++-
9 files changed, 15 insertions(+), 62 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 000c10a..7442a0e 100644
index 15cbb26..c012319 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,27 +17,15 @@ members = [
@@ -18,29 +18,15 @@ members = [
"src/tools/tidy",
"src/tools/tier-check",
"src/tools/build-manifest",
@ -30,6 +30,8 @@ index 000c10a..7442a0e 100644
- "src/tools/cargo/crates/credential/cargo-credential-1password",
- "src/tools/cargo/crates/credential/cargo-credential-macos-keychain",
- "src/tools/cargo/crates/credential/cargo-credential-wincred",
- "src/tools/cargo/crates/mdman",
- # "src/tools/cargo/crates/resolver-tests",
"src/tools/rustdoc",
- "src/tools/rls",
"src/tools/rustfmt",
@ -46,7 +48,7 @@ index 000c10a..7442a0e 100644
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
"src/tools/generate-copyright",
@@ -102,9 +90,6 @@ miniz_oxide.debug = 0
@@ -105,9 +91,6 @@ miniz_oxide.debug = 0
object.debug = 0
[patch.crates-io]
@ -57,10 +59,10 @@ index 000c10a..7442a0e 100644
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
# here
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 2d5018d..cc2ae13 100644
index 9cf43fc..39b985f 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -767,10 +767,6 @@ class RustBuild(object):
@@ -770,10 +770,6 @@ class RustBuild(object):
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
for _ in range(0, self.verbose):
args.append("--verbose")
@ -72,10 +74,10 @@ index 2d5018d..cc2ae13 100644
args.append("--features")
args.append("build-metrics")
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 8ee6d49..8bc92c8 100644
index b4fc1d4..2bb0659 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -596,8 +596,6 @@ impl<'a> Builder<'a> {
@@ -629,8 +629,6 @@ impl<'a> Builder<'a> {
tool::RemoteTestClient,
tool::RustInstaller,
tool::Cargo,
@ -84,7 +86,7 @@ index 8ee6d49..8bc92c8 100644
tool::RustAnalyzerProcMacroSrv,
tool::RustDemangler,
tool::Rustdoc,
@@ -618,10 +616,6 @@ impl<'a> Builder<'a> {
@@ -651,10 +649,6 @@ impl<'a> Builder<'a> {
check::CodegenBackend,
check::Clippy,
check::Miri,
@ -95,7 +97,7 @@ index 8ee6d49..8bc92c8 100644
check::Rustfmt,
check::Bootstrap
),
@@ -650,7 +644,6 @@ impl<'a> Builder<'a> {
@@ -684,7 +678,6 @@ impl<'a> Builder<'a> {
test::ReplacePlaceholderTest,
test::Cargotest,
test::Cargo,
@ -103,10 +105,11 @@ index 8ee6d49..8bc92c8 100644
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
@@ -698,10 +691,8 @@ impl<'a> Builder<'a> {
@@ -732,11 +725,8 @@ impl<'a> Builder<'a> {
doc::RustdocBook,
doc::RustByExample,
doc::RustcBook,
- doc::Cargo,
- doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
@ -114,7 +117,7 @@ index 8ee6d49..8bc92c8 100644
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
@@ -717,8 +708,6 @@ impl<'a> Builder<'a> {
@@ -752,8 +742,6 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
@ -123,7 +126,7 @@ index 8ee6d49..8bc92c8 100644
dist::Rustfmt,
dist::RustDemangler,
dist::Clippy,
@@ -739,7 +728,6 @@ impl<'a> Builder<'a> {
@@ -774,7 +762,6 @@ impl<'a> Builder<'a> {
install::Docs,
install::Std,
install::Cargo,
@ -131,7 +134,7 @@ index 8ee6d49..8bc92c8 100644
install::Rustfmt,
install::RustDemangler,
install::Clippy,
@@ -1823,10 +1811,7 @@ impl<'a> Builder<'a> {
@@ -1889,10 +1876,7 @@ impl<'a> Builder<'a> {
}
}
@ -144,10 +147,10 @@ index 8ee6d49..8bc92c8 100644
}
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 2c6fd1e..52c3eba 100644
index 9bad904..d02edb0 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -74,7 +74,6 @@ macro_rules! book {
@@ -75,7 +75,6 @@ macro_rules! book {
// FIXME: Make checking for a submodule automatic somehow (maybe by having a list of all submodules
// and checking against it?).
book!(
@ -156,10 +159,10 @@ index 2c6fd1e..52c3eba 100644
EditionGuide, "src/doc/edition-guide", "edition-guide", submodule;
EmbeddedBook, "src/doc/embedded-book", "embedded-book", submodule;
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 39cedfd..7ed7d97 100644
index 6078e39..1a385f5 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1975,17 +1975,7 @@ impl Step for RustcGuide {
@@ -2005,17 +2005,7 @@ impl Step for RustcGuide {
}
fn run(self, builder: &Builder<'_>) {
@ -179,7 +182,7 @@ index 39cedfd..7ed7d97 100644
}
diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
index fe425a2..23beb15 100644
index f8cb4b7..3aa9ec6 100644
--- a/src/tools/clippy/Cargo.toml
+++ b/src/tools/clippy/Cargo.toml
@@ -36,11 +36,6 @@ walkdir = "2.3"
@ -231,10 +234,10 @@ index 7a4e02d..27b91f2 100644
[package.metadata.rust-analyzer]
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 296db9d..0369861 100644
index bc2edf6..142c2e9 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -333,7 +333,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
@@ -332,7 +332,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
// This crate takes quite a long time to build, so don't allow two versions of them
// to accidentally sneak into our dependency graph, in order to ensure we keep our CI times
// under control.
@ -243,12 +246,12 @@ index 296db9d..0369861 100644
];
/// Dependency checks.
@@ -629,6 +629,8 @@
@@ -608,6 +608,8 @@ fn direct_deps_of<'a>(metadata: &'a Metadata, pkg_id: &'a PackageId) -> Vec<&'a
}
fn check_rustfix(metadata: &Metadata, bad: &mut bool) {
+ // Debian: we don't build cargo here, so this function doens't function.
+ return;
let cargo = pkg_from_name(metadata, "cargo");
let compiletest = pkg_from_name(metadata, "compiletest");
let cargo_deps = deps_of(metadata, &cargo.id);
let cargo_deps = direct_deps_of(metadata, &cargo.id);

74
debian/patches/d-0002-mdbook-strip-embedded-libs.patch vendored
View File

@ -6,12 +6,12 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
---
src/tools/linkchecker/main.rs | 28 ++++++-
vendor/mdbook/src/book/init.rs | 6 --
.../src/renderer/html_handlebars/hbs_renderer.rs | 80 ++-----------------
.../src/renderer/html_handlebars/hbs_renderer.rs | 80 ++----------------
.../mdbook/src/renderer/html_handlebars/search.rs | 2 -
vendor/mdbook/src/theme/index.hbs | 93 +---------------------
vendor/mdbook/src/theme/mod.rs | 27 -------
vendor/mdbook/src/theme/index.hbs | 97 +---------------------
vendor/mdbook/src/theme/mod.rs | 27 ------
vendor/mdbook/src/theme/searcher/mod.rs | 2 -
7 files changed, 35 insertions(+), 203 deletions(-)
7 files changed, 37 insertions(+), 205 deletions(-)
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index 4170c32..d7dcda7 100644
@ -67,10 +67,10 @@ index 4170c32..d7dcda7 100644
report.links_ignored_exception += 1;
} else {
diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs
index 264c113..2b0ff3a 100644
index dd3fa8b..a088517 100644
--- a/vendor/mdbook/src/book/init.rs
+++ b/vendor/mdbook/src/book/init.rs
@@ -151,12 +151,6 @@ impl BookBuilder {
@@ -152,12 +152,6 @@ impl BookBuilder {
let mut js = File::create(themedir.join("book.js"))?;
js.write_all(theme::JS)?;
@ -84,7 +84,7 @@ index 264c113..2b0ff3a 100644
}
diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
index b933a35..09b4a7a 100644
index 1b648da..5fe813c 100644
--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
@@ -3,7 +3,7 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition};
@ -104,7 +104,7 @@ index b933a35..09b4a7a 100644
use crate::utils::fs::get_404_output_file;
use handlebars::Handlebars;
@@ -232,80 +233,13 @@ impl HtmlHandlebars {
@@ -235,80 +236,13 @@ impl HtmlHandlebars {
if let Some(contents) = &theme.favicon_svg {
write_file(destination, "favicon.svg", contents)?;
}
@ -191,10 +191,10 @@ index b933a35..09b4a7a 100644
Ok(())
}
diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs
index c3b944c..d4bbe35 100644
index a9e2f5c..3e3f69c 100644
--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
+++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
@@ -52,8 +52,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
format!("Object.assign(window.search, {});", index).as_bytes(),
)?;
utils::fs::write_file(destination, "searcher.js", searcher::JS)?;
@ -204,10 +204,10 @@ index c3b944c..d4bbe35 100644
}
diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs
index 18d984a..4a0e2d1 100644
index 147eb9a..27d358b 100644
--- a/vendor/mdbook/src/theme/index.hbs
+++ b/vendor/mdbook/src/theme/index.hbs
@@ -34,10 +34,7 @@
@@ -33,10 +33,7 @@
{{/if}}
<!-- Fonts -->
@ -219,21 +219,21 @@ index 18d984a..4a0e2d1 100644
<!-- Highlight.js Stylesheets -->
<link rel="stylesheet" href="{{ path_to_root }}highlight.css">
@@ -51,7 +48,7 @@
@@ -50,7 +47,7 @@
{{#if mathjax_support}}
<!-- MathJax -->
- <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async type="text/javascript" src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
- <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
{{/if}}
</head>
<body>
@@ -61,46 +58,6 @@
@@ -60,46 +57,6 @@
var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
</script>
- <!-- Work around some values being stored in localStorage wrapped in quotes -->
- <script type="text/javascript">
- <script>
- try {
- var theme = localStorage.getItem('mdbook-theme');
- var sidebar = localStorage.getItem('mdbook-sidebar');
@ -249,7 +249,7 @@ index 18d984a..4a0e2d1 100644
- </script>
-
- <!-- Set the theme before any content is loaded, prevents flash -->
- <script type="text/javascript">
- <script>
- var theme;
- try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
- if (theme === null || theme === undefined) { theme = default_theme; }
@ -261,7 +261,7 @@ index 18d984a..4a0e2d1 100644
- </script>
-
- <!-- Hide / unhide sidebar before it is displayed -->
- <script type="text/javascript">
- <script>
- var html = document.querySelector('html');
- var sidebar = 'hidden';
- if (document.body.clientWidth >= 1080) {
@ -275,13 +275,13 @@ index 18d984a..4a0e2d1 100644
<nav id="sidebar" class="sidebar" aria-label="Table of contents">
<div class="sidebar-scrollbox">
{{#toc}}{{/toc}}
@@ -238,52 +195,6 @@
@@ -237,54 +194,8 @@
</script>
{{/if}}
- {{#if google_analytics}}
- <!-- Google Analytics Tag -->
- <script type="text/javascript">
- <script>
- var localAddrs = ["localhost", "127.0.0.1", ""];
-
- // make sure we don't activate google analytics if the developer is
@ -299,37 +299,41 @@ index 18d984a..4a0e2d1 100644
- {{/if}}
-
- {{#if playground_line_numbers}}
- <script type="text/javascript">
- <script>
- window.playground_line_numbers = true;
- </script>
- {{/if}}
-
- {{#if playground_copyable}}
- <script type="text/javascript">
- <script>
- window.playground_copyable = true;
- </script>
- {{/if}}
-
- {{#if playground_js}}
- <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}ace.js"></script>
- <script src="{{ path_to_root }}editor.js"></script>
- <script src="{{ path_to_root }}mode-rust.js"></script>
- <script src="{{ path_to_root }}theme-dawn.js"></script>
- <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
- {{/if}}
-
- {{#if search_js}}
- <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}elasticlunr.min.js"></script>
- <script src="{{ path_to_root }}mark.min.js"></script>
- <script src="{{ path_to_root }}searcher.js"></script>
- {{/if}}
-
- <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
- <script src="{{ path_to_root }}clipboard.min.js"></script>
- <script src="{{ path_to_root }}highlight.js"></script>
- <script src="{{ path_to_root }}book.js"></script>
+ <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
+ <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
<!-- Custom JS scripts -->
{{#each additional_js}}
diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs
index a1ee18a..d059f01 100644
index 7af5e2b..3086fcf 100644
--- a/vendor/mdbook/src/theme/mod.rs
+++ b/vendor/mdbook/src/theme/mod.rs
@@ -1,9 +1,5 @@

4
debian/patches/d-0003-cc-psm-rebuild-wasm32.patch vendored
View File

@ -8,10 +8,10 @@ Subject: d-0003-cc-psm-rebuild-wasm32
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
index a89e353..ccf99d2 100644
index 486d67e..723b2e9 100644
--- a/vendor/cc/src/lib.rs
+++ b/vendor/cc/src/lib.rs
@@ -2341,7 +2341,7 @@ impl Build {
@@ -2369,7 +2369,7 @@ impl Build {
|| target == "wasm32-unknown-wasi"
|| target == "wasm32-unknown-unknown"
{

2
debian/patches/d-0004-clippy-feature-sync.patch vendored
View File

@ -10,7 +10,7 @@ this is what rustc_workspace_hack does in the upstream build.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
index 23beb15..ad8231a 100644
index 3aa9ec6..0bb813d 100644
--- a/src/tools/clippy/Cargo.toml
+++ b/src/tools/clippy/Cargo.toml
@@ -43,7 +43,7 @@ if_chain = "1.0"