Update files for importing 1.46.0~beta.2

diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh
index b0bf28cce0964f0e47e6213a3562457dec6a08f7..444c3fcc56621dcb6c2f6c0a64eb9d73ce3a6452 100755 (executable)
--- a/debian/check-orig-suspicious.sh
+++ b/debian/check-orig-suspicious.sh
@@ -9,6 +9,11 @@ SUS_WHITELIST=$(find "${PWD}/debian" -name upstream-tarball-unsuspicious.txt -ty
 rm -rf rustc-${ver/*~*/beta}-src/
 tar xf ../rustc_$ver+dfsg1.orig.tar.xz && cd rustc-${ver/*~*/beta}-src/
 
+# TODO: remove this code snippet after it gets into our cargo
+# Strip comments & blank lines before testing rust source code -
+# some authors like to write really long comments
+find . -name '*.rs' -execdir sed -i -e '\,^\s*//,d' -e '/^\s*$/d' '{}' \;
+
 /usr/share/cargo/scripts/audit-vendor-source \
   "$SUS_WHITELIST" \
   "Files-Excluded: in debian/copyright and run a repack."

diff --git a/debian/copyright b/debian/copyright
index a58d180195653f03312908e566bb1127a8b73171..520c1e609cc0b10f624630011b04d71bf9077392 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Files-Excluded:
  src/llvm-emscripten
  src/llvm-project
  vendor/jemalloc-sys
+ vendor/mdbook/src/theme/fonts
  vendor/mdbook/src/theme/FontAwesome
  vendor/mdbook/src/theme/highlight.js
  vendor/mdbook/src/theme/highlight.css
@@ -22,6 +23,7 @@ Files-Excluded:
  src/tools/rls
  src/tools/remote-test-client
  src/tools/remote-test-server
+ src/tools/rust-analyzer
  src/tools/rustfmt
  src/tools/miri
 # Embedded C libraries
@@ -29,32 +31,37 @@ Files-Excluded:
  vendor/lzma-sys*/xz-*
 # Embedded binary blobs
  vendor/winapi-*/*/*.a
- vendor/mdbook/src/theme/playpen_editor
+ vendor/mdbook/src/theme/playground_editor
 # Embedded proprietary doc formats
  src/doc/book/nostarch/docx
 # unused dependencies, generated by debian/prune-unused-deps
 # DO NOT EDIT below, AUTOGENERATED
- vendor/adler32
+ vendor/adler32-1.0.3
+ vendor/aho-corasick-0.7.10
+ vendor/annotate-snippets-0.6.1
  vendor/arc-swap
  vendor/argon2rs
- vendor/base64
+ vendor/arrayvec-0.4.7
+ vendor/backtrace-0.3.46
  vendor/bitmaps
  vendor/blake2-rfc
+ vendor/bstr-0.1.3
  vendor/bytecount
+ vendor/byteorder-1.3.2
  vendor/bytes
  vendor/bytesize
  vendor/cargo_metadata-0.8.0
+ vendor/chrono-0.4.6
  vendor/colored
  vendor/commoncrypto
  vendor/commoncrypto-sys
  vendor/compiletest_rs
  vendor/constant_time_eq
- vendor/cookie
- vendor/cookie_store
- vendor/core-foundation-0.6.3
  vendor/core-foundation
- vendor/core-foundation-sys-0.6.2
  vendor/core-foundation-sys
+ vendor/crossbeam-channel-0.4.0
+ vendor/crossbeam-deque-0.7.1
+ vendor/crossbeam-epoch-0.7.2
  vendor/crypto-hash
  vendor/curl
  vendor/curl-sys
@@ -63,33 +70,34 @@ Files-Excluded:
  vendor/directories
  vendor/dirs
  vendor/dirs-sys
- vendor/dtoa
- vendor/dunce
- vendor/encoding_rs
+ vendor/either-1.5.0
+ vendor/env_logger-0.6.2
+ vendor/failure
+ vendor/failure_derive
+ vendor/filetime-0.2.9
+ vendor/fnv-1.0.6
  vendor/foreign-types
  vendor/foreign-types-shared
- vendor/fst
+ vendor/fst-0.3.0
  vendor/fuchsia-cprng
  vendor/futures
- vendor/futures-cpupool
  vendor/fwdansi
  vendor/git2
  vendor/git2-curl
  vendor/glob
- vendor/h2
+ vendor/globset-0.4.3
+ vendor/heck-0.3.0
  vendor/hex-0.3.2
  vendor/hex
- vendor/home
- vendor/httparse
- vendor/http-body
- vendor/http
+ vendor/home-0.5.1
  vendor/humantime
- vendor/hyper
- vendor/hyper-tls
  vendor/idna-0.1.5
  vendor/if_chain
  vendor/im-rc
+ vendor/indexmap-1.0.2
  vendor/iovec
+ vendor/itoa-0.4.4
+ vendor/jemalloc-sys-0.3.0
  vendor/json
  vendor/jsonrpc-client-transports
  vendor/jsonrpc-core
@@ -103,19 +111,21 @@ Files-Excluded:
  vendor/libgit2-sys
  vendor/libnghttp2-sys
  vendor/libssh2-sys
- vendor/linked-hash-map
+ vendor/linked-hash-map-0.5.2
  vendor/lsp-codec
- vendor/lsp-types
- vendor/mdbook-linkcheck
- vendor/mime
- vendor/mime_guess
- vendor/miniz_oxide
- vendor/mio
+ vendor/lsp-types-0.60.0
+ vendor/memoffset-0.5.1
+ vendor/miniz_oxide-0.3.5
+ vendor/mio-0.6.16
  vendor/mio-named-pipes
  vendor/mio-uds
  vendor/miow-0.2.1
- vendor/native-tls
- vendor/net2
+ vendor/net2-0.2.33
+ vendor/nodrop
+ vendor/num_cpus-1.10.1
+ vendor/num-integer-0.1.39
+ vendor/num-traits-0.2.6
+ vendor/once_cell-1.1.0
  vendor/openssl
  vendor/openssl-probe
  vendor/openssl-src
@@ -125,21 +135,25 @@ Files-Excluded:
  vendor/parity-tokio-ipc
  vendor/percent-encoding-1.0.1
  vendor/pretty_env_logger
+ vendor/proc-macro2-1.0.3
  vendor/proc-macro-crate
  vendor/proc-macro-error
- vendor/publicsuffix
  vendor/quine-mc_cluskey
+ vendor/quote-1.0.2
  vendor/racer
  vendor/rand_core-0.4.0
  vendor/rand_os
  vendor/rand_xoshiro
+ vendor/rayon-1.2.0
+ vendor/rayon-core-1.6.0
  vendor/rdrand
  vendor/redox_users
- vendor/reqwest
+ vendor/regex-1.3.7
+ vendor/regex-syntax-0.6.17
+ vendor/remove_dir_all-0.5.2
  vendor/rls-analysis
  vendor/rls-vfs
- vendor/rustc-ap-arena
- vendor/rustc-ap-graphviz
+ vendor/rustc-ap-rustc_arena
  vendor/rustc-ap-rustc_ast
  vendor/rustc-ap-rustc_ast_passes
  vendor/rustc-ap-rustc_ast_pretty
@@ -149,36 +163,41 @@ Files-Excluded:
  vendor/rustc-ap-rustc_expand
  vendor/rustc-ap-rustc_feature
  vendor/rustc-ap-rustc_fs_util
+ vendor/rustc-ap-rustc_graphviz
  vendor/rustc-ap-rustc_index
- vendor/rustc-ap-rustc_lexer
+ vendor/rustc-ap-rustc_lexer-664.0.0
  vendor/rustc-ap-rustc_macros
  vendor/rustc-ap-rustc_parse
+ vendor/rustc-ap-rustc_serialize
  vendor/rustc-ap-rustc_session
  vendor/rustc-ap-rustc_span
  vendor/rustc-ap-rustc_target
- vendor/rustc-ap-serialize
  vendor/rustc_tools_util
+ vendor/ryu-1.0.0
+ vendor/same-file-1.0.4
  vendor/schannel
  vendor/scoped_threadpool
- vendor/security-framework
- vendor/security-framework-sys
+ vendor/scopeguard-1.0.0
  vendor/semver
+ vendor/serde-1.0.99
+ vendor/serde_derive-1.0.106
  vendor/serde_ignored
- vendor/serde_repr
- vendor/serde_urlencoded
+ vendor/serde_json-1.0.40
+ vendor/serde_repr-0.1.5
  vendor/shell-escape
  vendor/signal-hook
  vendor/sized-chunks
  vendor/slab
- vendor/string
  vendor/strip-ansi-escapes
  vendor/structopt
  vendor/structopt-derive
+ vendor/syn-1.0.11
+ vendor/synstructure-0.12.1
  vendor/term
  vendor/tester
  vendor/thiserror
  vendor/thiserror-impl
- vendor/tokio-buf
+ vendor/time-0.1.42
  vendor/tokio
  vendor/tokio-codec
  vendor/tokio-current-thread
@@ -196,21 +215,22 @@ Files-Excluded:
  vendor/tokio-timer
  vendor/tokio-udp
  vendor/tokio-uds
- vendor/try_from
- vendor/try-lock
  vendor/unicode_categories
+ vendor/unicode-normalization-0.1.12
+ vendor/unicode-xid-0.2.0
  vendor/url-1.7.2
+ vendor/url-2.1.0
  vendor/utf8parse
- vendor/uuid
  vendor/vergen
  vendor/vte
- vendor/want
+ vendor/walkdir-2.2.7
  vendor/winapi-0.2.8
+ vendor/winapi-0.3.8
  vendor/winapi-build
- vendor/winreg
+ vendor/winapi-util-0.1.2
  vendor/ws2_32-sys
  vendor/yaml-merge-keys
- vendor/yaml-rust
+ vendor/yaml-rust-0.4.3
 # DO NOT EDIT above, AUTOGENERATED
 
 Files: C*.md

diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 360db2c7c329bf123a039955e20138387e118d9f..c5954ffdfd71f09d3e7a2bb16d804856cb67214d 100644 (file)
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -32,8 +32,8 @@ Forwarded: not-needed
  exclude = [
    "build",
 @@ -47,29 +40,10 @@ debug-assertions = false
- debug = false
- debug-assertions = false
+ # per-crate configuration isn't specifiable in the environment.
+ codegen-units = 10000
  
 -# We want the RLS to use the version of Cargo that we've got vendored in this
 -# repository to ensure that the same exact version of Cargo is used by both the
@@ -143,51 +143,6 @@ Forwarded: not-needed
      }
  }
  
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -273,14 +273,14 @@ pub fn prepare_tool_cargo(
- }
- 
- fn rustbook_features() -> Vec<String> {
--    let mut features = Vec::new();
-+    let features = Vec::new();
- 
-     // Due to CI budged and risk of spurious failures we want to limit jobs running this check.
-     // At same time local builds should run it regardless of the platform.
-     // `CiEnv::None` means it's local build and `CHECK_LINKS` is defined in x86_64-gnu-tools to
-     // explicitly enable it on single job
-     if CiEnv::current() == CiEnv::None || env::var("CHECK_LINKS").is_ok() {
--        features.push("linkcheck".to_string());
-+    //    features.push("linkcheck".to_string());
-     }
- 
-     features
---- a/src/tools/rustbook/Cargo.toml
-+++ b/src/tools/rustbook/Cargo.toml
-@@ -6,22 +6,16 @@ license = "MIT OR Apache-2.0"
- edition = "2018"
- 
- [features]
--linkcheck = ["mdbook-linkcheck", "codespan-reporting", "codespan"]
-+linkcheck = []
- 
- [dependencies]
- clap = "2.25.0"
- failure = "0.1"
--mdbook-linkcheck = { version = "0.5.0", optional = true }
- # Keep in sync with mdbook-linkcheck.
- codespan = { version = "0.5", optional = true }
- codespan-reporting = { version = "0.5", optional = true }
- 
- 
--# A noop dependency that changes in the Rust repository, it's a bit of a hack.
--# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
--# for more information.
--rustc-workspace-hack = "1.0.0"
--
- [dependencies.mdbook]
- version = "0.3.7"
- default-features = false
 --- a/src/tools/tidy/src/deps.rs
 +++ b/src/tools/tidy/src/deps.rs
 @@ -406,8 +406,8 @@ fn check_crate_duplicate(resolve: &Resol

diff --git a/debian/patches/d-0003-mdbook-strip-embedded-libs.patch b/debian/patches/d-0003-mdbook-strip-embedded-libs.patch
index eb4a9db77f45d942474dd7a3eadf7a8ed17d2319..41a8d7f7698c0f82d6c75d40e5d689e3d88e5574 100644 (file)
--- a/debian/patches/d-0003-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/d-0003-mdbook-strip-embedded-libs.patch
@@ -23,124 +23,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          let mut parts = url.splitn(2, "#");
          let url = parts.next().unwrap();
          let fragment = parts.next();
---- a/vendor/mdbook/src/book/init.rs   2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/book/init.rs   2020-03-23 11:46:30.657963205 +0100
-@@ -148,12 +148,6 @@ impl BookBuilder {
-         let mut js = File::create(themedir.join("book.js"))?;
-         js.write_all(theme::JS)?;
- 
--        let mut highlight_css = File::create(themedir.join("highlight.css"))?;
--        highlight_css.write_all(theme::HIGHLIGHT_CSS)?;
--
--        let mut highlight_js = File::create(themedir.join("highlight.js"))?;
--        highlight_js.write_all(theme::HIGHLIGHT_JS)?;
--
-         Ok(())
-     }
- 
---- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs       2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs       2020-03-23 11:46:30.657963205 +0100
-@@ -3,7 +3,7 @@ use crate::config::{Config, HtmlConfig,
- use crate::errors::*;
- use crate::renderer::html_handlebars::helpers;
- use crate::renderer::{RenderContext, Renderer};
--use crate::theme::{self, playpen_editor, Theme};
-+use crate::theme::{self, Theme};
- use crate::utils;
- 
- use std::borrow::Cow;
-@@ -114,7 +114,7 @@ impl HtmlHandlebars {
-         &self,
-         destination: &Path,
-         theme: &Theme,
--        html_config: &HtmlConfig,
-+        _html_config: &HtmlConfig,
-     ) -> Result<()> {
-         use crate::utils::fs::write_file;
- 
-@@ -130,62 +130,8 @@ impl HtmlHandlebars {
-         write_file(destination, "css/print.css", &theme.print_css)?;
-         write_file(destination, "css/variables.css", &theme.variables_css)?;
-         write_file(destination, "favicon.png", &theme.favicon)?;
--        write_file(destination, "highlight.css", &theme.highlight_css)?;
-         write_file(destination, "tomorrow-night.css", &theme.tomorrow_night_css)?;
-         write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?;
--        write_file(destination, "highlight.js", &theme.highlight_js)?;
--        write_file(destination, "clipboard.min.js", &theme.clipboard_js)?;
--        write_file(
--            destination,
--            "FontAwesome/css/font-awesome.css",
--            theme::FONT_AWESOME,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/fontawesome-webfont.eot",
--            theme::FONT_AWESOME_EOT,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/fontawesome-webfont.svg",
--            theme::FONT_AWESOME_SVG,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/fontawesome-webfont.ttf",
--            theme::FONT_AWESOME_TTF,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/fontawesome-webfont.woff",
--            theme::FONT_AWESOME_WOFF,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/fontawesome-webfont.woff2",
--            theme::FONT_AWESOME_WOFF2,
--        )?;
--        write_file(
--            destination,
--            "FontAwesome/fonts/FontAwesome.ttf",
--            theme::FONT_AWESOME_TTF,
--        )?;
--
--        let playpen_config = &html_config.playpen;
--
--        // Ace is a very large dependency, so only load it when requested
--        if playpen_config.editable && playpen_config.copy_js {
--            // Load the editor
--            write_file(destination, "editor.js", playpen_editor::JS)?;
--            write_file(destination, "ace.js", playpen_editor::ACE_JS)?;
--            write_file(destination, "mode-rust.js", playpen_editor::MODE_RUST_JS)?;
--            write_file(destination, "theme-dawn.js", playpen_editor::THEME_DAWN_JS)?;
--            write_file(
--                destination,
--                "theme-tomorrow_night.js",
--                playpen_editor::THEME_TOMORROW_NIGHT_JS,
--            )?;
--        }
- 
-         Ok(())
-     }
---- a/vendor/mdbook/src/renderer/html_handlebars/search.rs     2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs     2020-03-23 11:46:30.657963205 +0100
-@@ -34,8 +34,6 @@ pub fn create_files(search_config: &Sear
-             format!("Object.assign(window.search, {});", index).as_bytes(),
-         )?;
-         utils::fs::write_file(destination, "searcher.js", searcher::JS)?;
--        utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?;
--        utils::fs::write_file(destination, "elasticlunr.min.js", searcher::ELASTICLUNR_JS)?;
-         debug!("Copying search files ✓");
-     }
- 
---- a/vendor/mdbook/src/theme/index.hbs        2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/theme/index.hbs        2020-03-23 11:46:30.657963205 +0100
-@@ -20,12 +20,10 @@
+--- a/vendor/mdbook/src/theme/index.hbs
++++ b/vendor/mdbook/src/theme/index.hbs
+@@ -28,13 +28,10 @@
          <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
  
          <!-- Fonts -->
 -        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
--        <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
--        <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500" rel="stylesheet" type="text/css">
+-        {{#if copy_fonts}}
+-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+-        {{/if}}
 +        <link rel="stylesheet" href="{{ path_to_root }}../font-awesome.min.css">
  
          <!-- Highlight.js Stylesheets -->
@@ -149,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
          <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
  
-@@ -36,7 +34,7 @@
+@@ -45,7 +42,7 @@
  
          {{#if mathjax_support}}
          <!-- MathJax -->
@@ -158,7 +50,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          {{/if}}
      </head>
      <body>
-@@ -46,46 +44,6 @@
+@@ -55,46 +52,6 @@
              var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
          </script>
  
@@ -205,7 +97,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          <nav id="sidebar" class="sidebar" aria-label="Table of contents">
              <div class="sidebar-scrollbox">
                  {{#toc}}{{/toc}}
-@@ -214,53 +172,7 @@
+@@ -222,53 +179,7 @@
          </script>
          {{/if}}
  
@@ -228,19 +120,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -        </script>
 -        {{/if}}
 -
--        {{#if playpen_line_numbers}}
+-        {{#if playground_line_numbers}}
 -        <script type="text/javascript">
--            window.playpen_line_numbers = true;
+-            window.playground_line_numbers = true;
 -        </script>
 -        {{/if}}
--        
--        {{#if playpen_copyable}}
+-
+-        {{#if playground_copyable}}
 -        <script type="text/javascript">
--            window.playpen_copyable = true;
+-            window.playground_copyable = true;
 -        </script>
 -        {{/if}}
 -
--        {{#if playpen_js}}
+-        {{#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>
@@ -260,19 +152,154 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
  
          <!-- Custom JS scripts -->
---- a/vendor/mdbook/src/theme/mod.rs   2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/theme/mod.rs   2020-03-23 11:46:30.657963205 +0100
-@@ -1,7 +1,5 @@
+commit 5438f218c14fd73b81ab982334373efb7de6fdf2
+Author: Ximin Luo <infinity0@pwned.gg>
+Date:   Thu Aug 6 22:06:10 2020 +0100
+
+    Work around removal of binary blobs
+
+--- a/vendor/mdbook/src/book/init.rs
++++ b/vendor/mdbook/src/book/init.rs
+@@ -151,12 +151,6 @@ impl BookBuilder {
+         let mut js = File::create(themedir.join("book.js"))?;
+         js.write_all(theme::JS)?;
+ 
+-        let mut highlight_css = File::create(themedir.join("highlight.css"))?;
+-        highlight_css.write_all(theme::HIGHLIGHT_CSS)?;
+-
+-        let mut highlight_js = File::create(themedir.join("highlight.js"))?;
+-        highlight_js.write_all(theme::HIGHLIGHT_JS)?;
+-
+         Ok(())
+     }
+ 
+--- 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::{Config, HtmlConfig, Playground, RustEdition};
+ use crate::errors::*;
+ use crate::renderer::html_handlebars::helpers;
+ use crate::renderer::{RenderContext, Renderer};
+-use crate::theme::{self, playground_editor, Theme};
++use crate::theme::{self, Theme};
+ use crate::utils;
+ 
+ use std::borrow::Cow;
+@@ -177,7 +177,7 @@ impl HtmlHandlebars {
+         &self,
+         destination: &Path,
+         theme: &Theme,
+-        html_config: &HtmlConfig,
++        _html_config: &HtmlConfig,
+     ) -> Result<()> {
+         use crate::utils::fs::write_file;
+ 
+@@ -194,80 +194,8 @@ impl HtmlHandlebars {
+         write_file(destination, "css/variables.css", &theme.variables_css)?;
+         write_file(destination, "favicon.png", &theme.favicon_png)?;
+         write_file(destination, "favicon.svg", &theme.favicon_svg)?;
+-        write_file(destination, "highlight.css", &theme.highlight_css)?;
+         write_file(destination, "tomorrow-night.css", &theme.tomorrow_night_css)?;
+         write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?;
+-        write_file(destination, "highlight.js", &theme.highlight_js)?;
+-        write_file(destination, "clipboard.min.js", &theme.clipboard_js)?;
+-        write_file(
+-            destination,
+-            "FontAwesome/css/font-awesome.css",
+-            theme::FONT_AWESOME,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/fontawesome-webfont.eot",
+-            theme::FONT_AWESOME_EOT,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/fontawesome-webfont.svg",
+-            theme::FONT_AWESOME_SVG,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/fontawesome-webfont.ttf",
+-            theme::FONT_AWESOME_TTF,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/fontawesome-webfont.woff",
+-            theme::FONT_AWESOME_WOFF,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/fontawesome-webfont.woff2",
+-            theme::FONT_AWESOME_WOFF2,
+-        )?;
+-        write_file(
+-            destination,
+-            "FontAwesome/fonts/FontAwesome.ttf",
+-            theme::FONT_AWESOME_TTF,
+-        )?;
+-        if html_config.copy_fonts {
+-            write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?;
+-            for (file_name, contents) in theme::fonts::LICENSES.iter() {
+-                write_file(destination, file_name, contents)?;
+-            }
+-            for (file_name, contents) in theme::fonts::OPEN_SANS.iter() {
+-                write_file(destination, file_name, contents)?;
+-            }
+-            write_file(
+-                destination,
+-                theme::fonts::SOURCE_CODE_PRO.0,
+-                theme::fonts::SOURCE_CODE_PRO.1,
+-            )?;
+-        }
+-
+-        let playground_config = &html_config.playground;
+-
+-        // Ace is a very large dependency, so only load it when requested
+-        if playground_config.editable && playground_config.copy_js {
+-            // Load the editor
+-            write_file(destination, "editor.js", playground_editor::JS)?;
+-            write_file(destination, "ace.js", playground_editor::ACE_JS)?;
+-            write_file(destination, "mode-rust.js", playground_editor::MODE_RUST_JS)?;
+-            write_file(
+-                destination,
+-                "theme-dawn.js",
+-                playground_editor::THEME_DAWN_JS,
+-            )?;
+-            write_file(
+-                destination,
+-                "theme-tomorrow_night.js",
+-                playground_editor::THEME_TOMORROW_NIGHT_JS,
+-            )?;
+-        }
+ 
+         Ok(())
+     }
+--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
++++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
+@@ -34,8 +34,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)?;
+-        utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?;
+-        utils::fs::write_file(destination, "elasticlunr.min.js", searcher::ELASTICLUNR_JS)?;
+         debug!("Copying search files ✓");
+     }
+ 
+--- a/vendor/mdbook/src/theme/mod.rs
++++ b/vendor/mdbook/src/theme/mod.rs
+@@ -1,9 +1,5 @@
  #![allow(missing_docs)]
  
--pub mod playpen_editor;
+-pub mod playground_editor;
+-
+-pub mod fonts;
 -
  #[cfg(feature = "search")]
  pub mod searcher;
  
-@@ -19,19 +17,8 @@ pub static PRINT_CSS: &[u8] = include_by
- pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css");
- pub static FAVICON: &[u8] = include_bytes!("favicon.png");
+@@ -24,19 +22,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css");
+ pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png");
+ pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg");
  pub static JS: &[u8] = include_bytes!("book.js");
 -pub static HIGHLIGHT_JS: &[u8] = include_bytes!("highlight.js");
  pub static TOMORROW_NIGHT_CSS: &[u8] = include_bytes!("tomorrow-night.css");
@@ -290,9 +317,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  /// The `Theme` struct should be used instead of the static variables because
  /// the `new()` method will look if the user has a theme directory in their
-@@ -49,11 +36,8 @@ pub struct Theme {
-     pub variables_css: Vec<u8>,
-     pub favicon: Vec<u8>,
+@@ -57,11 +44,8 @@ pub struct Theme {
+     pub favicon_png: Vec<u8>,
+     pub favicon_svg: Vec<u8>,
      pub js: Vec<u8>,
 -    pub highlight_css: Vec<u8>,
      pub tomorrow_night_css: Vec<u8>,
@@ -302,19 +329,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  }
  
  impl Theme {
-@@ -82,9 +66,6 @@ impl Theme {
-                     &mut theme.variables_css,
+@@ -93,9 +77,6 @@ impl Theme {
                  ),
-                 (theme_dir.join("favicon.png"), &mut theme.favicon),
+                 (theme_dir.join("favicon.png"), &mut theme.favicon_png),
+                 (theme_dir.join("favicon.svg"), &mut theme.favicon_svg),
 -                (theme_dir.join("highlight.js"), &mut theme.highlight_js),
 -                (theme_dir.join("clipboard.min.js"), &mut theme.clipboard_js),
 -                (theme_dir.join("highlight.css"), &mut theme.highlight_css),
                  (
                      theme_dir.join("tomorrow-night.css"),
                      &mut theme.tomorrow_night_css,
-@@ -121,11 +102,8 @@ impl Default for Theme {
-             variables_css: VARIABLES_CSS.to_owned(),
-             favicon: FAVICON.to_owned(),
+@@ -135,11 +116,8 @@ impl Default for Theme {
+             favicon_png: FAVICON_PNG.to_owned(),
+             favicon_svg: FAVICON_SVG.to_owned(),
              js: JS.to_owned(),
 -            highlight_css: HIGHLIGHT_CSS.to_owned(),
              tomorrow_night_css: TOMORROW_NIGHT_CSS.to_owned(),
@@ -324,21 +351,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          }
      }
  }
-@@ -175,11 +153,8 @@ mod tests {
-             "css/print.css",
-             "css/variables.css",
-             "book.js",
--            "highlight.js",
-             "tomorrow-night.css",
--            "highlight.css",
-             "ayu-highlight.css",
--            "clipboard.min.js",
-         ];
- 
-         let temp = TempFileBuilder::new().prefix("mdbook-").tempdir().unwrap();
-@@ -201,11 +176,8 @@ mod tests {
-             variables_css: Vec::new(),
-             favicon: Vec::new(),
+@@ -222,11 +200,8 @@ mod tests {
+             favicon_png: Vec::new(),
+             favicon_svg: Vec::new(),
              js: Vec::new(),
 -            highlight_css: Vec::new(),
              tomorrow_night_css: Vec::new(),
@@ -348,8 +363,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          };
  
          assert_eq!(got, empty);
---- a/vendor/mdbook/src/theme/searcher/mod.rs  2020-03-10 01:00:20.000000000 +0100
-+++ b/vendor/mdbook/src/theme/searcher/mod.rs  2020-03-23 11:46:30.657963205 +0100
+--- a/vendor/mdbook/src/theme/searcher/mod.rs
++++ b/vendor/mdbook/src/theme/searcher/mod.rs
 @@ -2,5 +2,3 @@
  //! the "search" cargo feature is disabled.
  

diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps
index ac43fe6bd16a39874183a7758b32e364b2cdd172..6c74b953c42aec2b3ac6581862953d2f12daa5e1 100755 (executable)
--- a/debian/prune-unused-deps
+++ b/debian/prune-unused-deps
@@ -15,6 +15,7 @@ for i in "$scriptdir/debian/patches"/d-00*.patch; do
 done
 test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig
 rm -f Cargo.lock
+sed -i -e 's/dev: 1/#dev: 1/g' src/stage0.txt # allow beta builds
 ./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap
 
 massage_lock_file() {

diff --git a/debian/rules b/debian/rules
index 69cea6e5b9c1d57643e21f454c9a45b5084683e4..f9c2a2e1618e4e211b35e534bde45bab81c8e623 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -178,6 +178,8 @@ debian/dh_auto_configure.stamp: debian/config.toml
        # work around #842634
        if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \
          debian/ensure-patch -N debian/patches/d-host-duplicates.patch; fi
+       # allow beta builds
+       sed -i -e 's/dev: 1/#dev: 1/g' src/stage0.txt
        # We patched some crates so have to rm the checksums
        find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" +
        # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16

diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
index 347b3276480c2299983b347ea07c68684ed2b930..8fe352227b6f4bfebb610a50fd840946d7ce50cc 100644 (file)
--- a/debian/upstream-tarball-unsuspicious.txt
+++ b/debian/upstream-tarball-unsuspicious.txt
@@ -25,6 +25,7 @@ src/doc/rustc/src/targets/known-issues.md
 src/doc/rustc-dev-guide/.travis.yml
 src/doc/rustc-dev-guide/src/*.md
 src/doc/rustc-dev-guide/src/*/*.md
+src/doc/rustdoc/src/*.md
 src/doc/*/CODE_OF_CONDUCT.md
 src/doc/unstable-book/src/*/*.md
 src/etc/third-party/README.txt
@@ -43,11 +44,9 @@ vendor/*/LICENSE
 vendor/*/*/LICENSE
 vendor/*/*/*/LICENSE
 vendor/ammonia/src/lib.rs
-vendor/clap/.github/CONTRIBUTING.md
+vendor/base64/RELEASE-NOTES.md
 vendor/clap/SPONSORS.md
-# ^ author likes to omit line breaks in their comments
-vendor/failure/book/src/bail-and-ensure.md
-# ^ same with this one
+vendor/clap/.github/CONTRIBUTING.md
 vendor/handlebars/src/lib.rs
 vendor/maplit/README.rst
 vendor/lazy_static/src/lib.rs
@@ -81,6 +80,7 @@ src/test/rustdoc-js/*.js
 src/test/rustdoc-js-std/*.js
 src/tools/rustdoc-js/tester.js
 src/tools/rustdoc-js-std/tester.js
+vendor/salsa/book/mermaid-init.js
 vendor/stacker/src/arch/windows.c
 
 # Embedded libraries, justified in README.source
@@ -108,12 +108,14 @@ vendor/backtrace-sys/src/libbacktrace/libtool.m4
 vendor/clap/.mention-bot
 vendor/cloudabi/cloudabi.rs
 vendor/elasticlunr-rs/src/lang/*.rs
+vendor/inotify-sys/inotify-sys.sublime-project
 vendor/markup5ever/data/entities.json
 vendor/num/ci/deploy.enc
 vendor/term-0*/scripts/id_rsa.enc
 
 # False-positive, hand-editable small image
 src/etc/installer/gfx/
+src/doc/embedded-book/src/assets/*.png
 src/doc/embedded-book/src/assets/*.svg
 src/doc/embedded-book/src/assets/f3.jpg
 src/doc/embedded-book/src/assets/nrf52-memory-map.png
@@ -134,9 +136,13 @@ src/doc/rustc-dev-guide/src/queries/example-0.png
 src/librustdoc/html/static/*.svg
 src/librustdoc/html/static/rust-logo.png
 src/librustdoc/html/static/favicon.ico
+vendor/addr2line/memory.png
+vendor/addr2line/time.png
+vendor/base64/icon_CLion.svg
 vendor/difference/assets/*.png
 vendor/fortanix-sgx-abi/images/enclave-execution-lifecycle.png
 vendor/heck/no_step_on_snek.png
+vendor/mdbook/src/theme/favicon.svg
 vendor/mdbook/src/theme/favicon.png
 vendor/num/doc/favicon.ico
 vendor/num/doc/rust-logo-128x128-blk-v2.png
@@ -164,6 +170,7 @@ src/test/*/issues/*.rs
 src/test/*/*/issue-*.rs
 src/test/*/*/issues/*.rs
 src/test/*/*.stderr
+src/test/*/*/*.rs
 src/test/*/*/*.json
 src/test/*/*/*.stderr
 src/test/*/*/*.stdout
@@ -171,10 +178,15 @@ src/test/*/*/*/*.stderr
 src/test/ui/terminal-width/non-whitespace-trimming*.rs
 src/tools/*/tests/*/*.stderr
 vendor/bstr/src/unicode/data/*Test.txt
+vendor/cargo_metadata/tests/test_samples.rs
 vendor/cssparser/src/css-parsing-tests/*.json
 vendor/cssparser/src/big-data-url.css
 vendor/elasticlunr-rs/tests/data/tr.in.txt
 vendor/flate2/tests/*.gz
+vendor/gimli/fixtures/self/*
+vendor/goblin/etc/*.rs
+vendor/goblin/tests/bins/elf/gnu_hash/helloworld.c
+vendor/goblin/tests/bins/elf/gnu_hash/*.so
 vendor/idna/tests/IdnaTest.txt
 vendor/idna/tests/punycode_tests.json
 vendor/idna-0*/tests/IdnaTest.txt
@@ -183,6 +195,7 @@ vendor/itertools/examples/iris.data
 vendor/html5ever/data/bench/*.html
 vendor/html5ever/html5lib-tests/*/*.dat
 vendor/html5ever/html5lib-tests/*/*.test
+vendor/libloading/tests/*.dll
 vendor/libz-sys/src/smoke.c
 vendor/md-5/tests/data/*.blb
 vendor/md-5/tests/data/*.bin
@@ -192,7 +205,10 @@ vendor/minifier/tests/files/test.json
 vendor/minifier/tests/files/main.js
 vendor/minifier/tests/files/minified_main.js
 vendor/pest/benches/data.json
+vendor/petgraph/tests/res/*.txt
 vendor/pretty_assertions/src/format_changeset.rs
+vendor/regex-automata/data/tests/fowler/basic.dat
+vendor/regex-automata/data/fowler-tests/basic.dat
 vendor/regex/src/testdata/basic.dat
 vendor/regex/tests/crates_regex.rs
 vendor/regex/tests/fowler.rs
@@ -217,6 +233,7 @@ vendor/ucd-parse/src/sentence_break.rs
 src/doc/rustc-dev-guide/src/mir/mir_*.svg
 src/librustdoc/html/static/normalize.css
 vendor/pest_meta/src/grammar.rs
+vendor/regex-syntax/src/unicode_tables/*.rs
 vendor/unicode-normalization/src/tables.rs
 vendor/unicode-script/src/tables.rs
 vendor/unicode-segmentation/src/tables.rs