Remove unneeded rustdoc content and add copyright for the rest (rus…

…t-lang#1038) * Remove some assets * Remove `rust-doc` files and submodules * Remove static files and references to them * Remove `highlight` tests and fixtures * Remove templates and code that used them with warnings (now hidden) * Add copyright modifications for TOML files * Add copyright modifications to Rust files * Remove asset formats not present anymore from exclude list * Keep original scope for non-used attributes * Remove html tests from `mod.rs` * Fix format issues
celinval · Apr 13, 2022 · 1d9485e · 1d9485e
1 parent 783a848
commit 1d9485e
Show file tree

Hide file tree

Showing 220 changed files with 330 additions and 17,440 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,21 +4,9 @@
 [submodule "src/doc/reference"]
 	path = tools/bookrunner/rust-doc/reference
 	url = https://github.com/rust-lang/reference.git
-[submodule "src/doc/book"]
-	path = tools/bookrunner/rust-doc/book
-	url = https://github.com/rust-lang/book.git
 [submodule "src/doc/rust-by-example"]
 	path = tools/bookrunner/rust-doc/rust-by-example
 	url = https://github.com/rust-lang/rust-by-example.git
-[submodule "src/doc/rustc-dev-guide"]
-	path = tools/bookrunner/rust-doc/rustc-dev-guide
-	url = https://github.com/rust-lang/rustc-dev-guide.git
-[submodule "src/doc/edition-guide"]
-	path = tools/bookrunner/rust-doc/edition-guide
-	url = https://github.com/rust-lang/edition-guide.git
-[submodule "src/doc/embedded-book"]
-	path = tools/bookrunner/rust-doc/embedded-book
-	url = https://github.com/rust-embedded/book.git
 [submodule "firecracker"]
 	path = firecracker
 	url = https://github.com/firecracker-microvm/firecracker.git
diff --git a/scripts/ci/copyright-exclude b/scripts/ci/copyright-exclude
@@ -11,9 +11,5 @@ gitmodules
 LICENSE-APACHE
 LICENSE-MIT
 Cargo.lock
-.svg
 .png
-.woff
-scripts/ci/copyright-exclude
-tools/bookrunner/librustdoc
-tools/bookrunner/rust-doc
+scripts/ci/copyright-exclude
diff --git a/tools/bookrunner/librustdoc/Cargo.toml b/tools/bookrunner/librustdoc/Cargo.toml
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+# Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# See GitHub history for details.
 [package]
 name = "rustdoc"
 version = "0.0.0"

diff --git a/tools/bookrunner/librustdoc/clean/auto_trait.rs b/tools/bookrunner/librustdoc/clean/auto_trait.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::lang_items::LangItem;

diff --git a/tools/bookrunner/librustdoc/clean/blanket_impl.rs b/tools/bookrunner/librustdoc/clean/blanket_impl.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use crate::rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;
 use rustc_infer::infer::{InferOk, TyCtxtInferExt};
 use rustc_infer::traits;

diff --git a/tools/bookrunner/librustdoc/clean/cfg.rs b/tools/bookrunner/librustdoc/clean/cfg.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! The representation of a `#[doc(cfg(...))]` attribute.
 
 // FIXME: Once the portability lint RFC is implemented (see tracking issue #41619),

diff --git a/tools/bookrunner/librustdoc/clean/cfg/tests.rs b/tools/bookrunner/librustdoc/clean/cfg/tests.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use super::*;
 
 use rustc_ast::attr;

diff --git a/tools/bookrunner/librustdoc/clean/inline.rs b/tools/bookrunner/librustdoc/clean/inline.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! Support for inlining external documentation into the current AST.
 
 use std::iter::once;

diff --git a/tools/bookrunner/librustdoc/clean/mod.rs b/tools/bookrunner/librustdoc/clean/mod.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! This module contains the "cleaned" pieces of the AST, and the functions
 //! that clean them.
 mod auto_trait;

diff --git a/tools/bookrunner/librustdoc/clean/simplify.rs b/tools/bookrunner/librustdoc/clean/simplify.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! Simplification of where-clauses and parameter bounds into a prettier and
 //! more canonical form.
 //!

diff --git a/tools/bookrunner/librustdoc/clean/types.rs b/tools/bookrunner/librustdoc/clean/types.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use std::cell::RefCell;
 use std::default::Default;
 use std::hash::Hash;

diff --git a/tools/bookrunner/librustdoc/clean/utils.rs b/tools/bookrunner/librustdoc/clean/utils.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use crate::clean::auto_trait::AutoTraitFinder;
 use crate::clean::blanket_impl::BlanketImplFinder;
 use crate::clean::{

diff --git a/tools/bookrunner/librustdoc/clean/utils/tests.rs b/tools/bookrunner/librustdoc/clean/utils/tests.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use super::*;
 
 #[test]

diff --git a/tools/bookrunner/librustdoc/config.rs b/tools/bookrunner/librustdoc/config.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use std::convert::TryFrom;
 use std::fmt;
 use std::path::PathBuf;

diff --git a/tools/bookrunner/librustdoc/core.rs b/tools/bookrunner/librustdoc/core.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::def::Res;
 use rustc_hir::def_id::DefId;

diff --git a/tools/bookrunner/librustdoc/docfs.rs b/tools/bookrunner/librustdoc/docfs.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! Rustdoc's FileSystem abstraction module.
 //!
 //! On Windows this indirects IO into threads to work around performance issues

diff --git a/tools/bookrunner/librustdoc/doctest.rs b/tools/bookrunner/librustdoc/doctest.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use rustc_ast as ast;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::Lrc;

diff --git a/tools/bookrunner/librustdoc/doctest/tests.rs b/tools/bookrunner/librustdoc/doctest/tests.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use super::{make_test, GlobalTestOptions};
 use rustc_span::edition::DEFAULT_EDITION;
 

diff --git a/tools/bookrunner/librustdoc/error.rs b/tools/bookrunner/librustdoc/error.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use std::error;
 use std::fmt::{self, Formatter};
 use std::path::{Path, PathBuf};

diff --git a/tools/bookrunner/librustdoc/externalfiles.rs b/tools/bookrunner/librustdoc/externalfiles.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use serde::Serialize;
 
 #[derive(Clone, Debug, Serialize)]

diff --git a/tools/bookrunner/librustdoc/fold.rs b/tools/bookrunner/librustdoc/fold.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use crate::clean::*;
 
 crate fn strip_item(mut item: Item) -> Item {

diff --git a/tools/bookrunner/librustdoc/formats/cache.rs b/tools/bookrunner/librustdoc/formats/cache.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use std::mem;
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};

diff --git a/tools/bookrunner/librustdoc/formats/item_type.rs b/tools/bookrunner/librustdoc/formats/item_type.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! Item types.
 
 use std::fmt;

diff --git a/tools/bookrunner/librustdoc/formats/mod.rs b/tools/bookrunner/librustdoc/formats/mod.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 crate mod cache;
 crate mod item_type;
 crate mod renderer;

diff --git a/tools/bookrunner/librustdoc/formats/renderer.rs b/tools/bookrunner/librustdoc/formats/renderer.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 use rustc_middle::ty::TyCtxt;
 
 use crate::clean;

diff --git a/tools/bookrunner/librustdoc/html/escape.rs b/tools/bookrunner/librustdoc/html/escape.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! HTML escaping.
 //!
 //! This module contains one unit struct, which can be used to HTML-escape a

diff --git a/tools/bookrunner/librustdoc/html/format.rs b/tools/bookrunner/librustdoc/html/format.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! HTML formatting module
 //!
 //! This module contains a large number of `fmt::Display` implementations for

diff --git a/tools/bookrunner/librustdoc/html/highlight.rs b/tools/bookrunner/librustdoc/html/highlight.rs
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+//
+// Modifications Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// See GitHub history for details.
 //! Basic syntax highlighting functionality.
 //!
 //! This module uses librustc_ast's lexer to provide token-based highlighting for
@@ -754,6 +758,3 @@ fn string<T: Display>(
     }
     write!(out, "<span class=\"{}\">{}</span>", klass.as_html(), text_s);
 }
-
-#[cfg(test)]
-mod tests;
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/decorations.html b/tools/bookrunner/librustdoc/html/highlight/fixtures/decorations.html
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/dos_line.html b/tools/bookrunner/librustdoc/html/highlight/fixtures/dos_line.html
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/highlight.html b/tools/bookrunner/librustdoc/html/highlight/fixtures/highlight.html
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/sample.html b/tools/bookrunner/librustdoc/html/highlight/fixtures/sample.html
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/sample.rs b/tools/bookrunner/librustdoc/html/highlight/fixtures/sample.rs
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/union.html b/tools/bookrunner/librustdoc/html/highlight/fixtures/union.html
diff --git a/tools/bookrunner/librustdoc/html/highlight/fixtures/union.rs b/tools/bookrunner/librustdoc/html/highlight/fixtures/union.rs