1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
Description: Ignore submodules that we're not building, or that are unused like
mdbook-linkcheck that pull in a ton of dependencies that are unneeded.
Author: Ximin Luo <infinity0@debian.org>
Forwarded: not-needed
@@ -6,7 +6,6 @@
"src/libtest",
"src/librustc_codegen_llvm",
"src/tools/cargotest",
- "src/tools/clippy",
"src/tools/compiletest",
"src/tools/error_index_generator",
"src/tools/linkchecker",
@@ -14,14 +13,8 @@
"src/tools/unstable-book-gen",
"src/tools/tidy",
"src/tools/build-manifest",
- "src/tools/remote-test-client",
- "src/tools/remote-test-server",
"src/tools/rust-installer",
- "src/tools/cargo",
"src/tools/rustdoc",
- "src/tools/rls",
- "src/tools/rustfmt",
- "src/tools/miri",
"src/tools/rustdoc-themes",
]
exclude = [
@@ -46,29 +39,10 @@
debug = false
debug-assertions = false
-# 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
-# RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository
-# so we use a `[patch]` here to override the github repository with our local
-# vendored copy.
-[patch."https://github.com/rust-lang/cargo"]
-cargo = { path = "src/tools/cargo" }
-
[patch.crates-io]
-# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
-# that we're shipping as well (to ensure that the rustfmt in RLS and the
-# `rustfmt` executable are the same exact version).
-rustfmt-nightly = { path = "src/tools/rustfmt" }
-
-# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
-# here
-rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
# See comments in `tools/rustc-std-workspace-core/README.md` for what's going on
# here
rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
-
-[patch."https://github.com/rust-lang/rust-clippy"]
-clippy_lints = { path = "src/tools/clippy/clippy_lints" }
@@ -656,10 +656,6 @@
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
for _ in range(1, self.verbose):
args.append("--verbose")
- if self.use_locked_deps:
- args.append("--locked")
- if self.use_vendored_sources:
- args.append("--frozen")
run(args, env=env, verbose=self.verbose)
def build_triple(self):
@@ -454,8 +454,6 @@
dist::Miri,
dist::LlvmTools,
dist::Lldb,
- dist::Extended,
- dist::HashSign
),
Kind::Install => describe!(
install::Docs,
@@ -1235,10 +1233,7 @@
}
}
- if self.config.locked_deps {
- cargo.arg("--locked");
- }
- if self.config.vendor || self.is_sudo {
+ if self.is_sudo {
cargo.arg("--frozen");
}
@@ -113,7 +113,7 @@
impl Step for CargoBook {
type Output = ();
- const DEFAULT: bool = true;
+ const DEFAULT: bool = false;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
let builder = run.builder;
@@ -87,7 +87,7 @@
## The Cargo Book
-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager.
+[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and dependency manager.
## The Rustdoc Book
@@ -1585,14 +1585,14 @@
}
fn run(self, builder: &Builder<'_>) {
- let src = builder.src.join("src/doc/rustc-guide");
- let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
- ToolState::TestPass
- } else {
- ToolState::TestFail
- };
- builder.save_toolstate("rustc-guide", toolstate);
+ //let src = builder.src.join("src/doc/rustc-guide");
+ //let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
+ //let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
+ // ToolState::TestPass
+ //} else {
+ // ToolState::TestFail
+ //};
+ builder.save_toolstate("rustc-guide", ToolState::TestPass);
}
}
@@ -277,14 +277,14 @@
}
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
@@ -6,21 +6,15 @@
edition = "2018"
[features]
-linkcheck = ["mdbook-linkcheck", "codespan-reporting"]
+linkcheck = []
[dependencies]
clap = "2.25.0"
failure = "0.1"
-mdbook-linkcheck = { version = "0.5.0", optional = true }
# Keep in sync with mdbook-linkcheck.
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.0"
default-features = false
@@ -404,8 +404,8 @@
// to accidentally sneak into our dependency graph, in order to ensure we keep our CI times
// under control.
- "cargo",
- "rustc-ap-syntax",
+ //"cargo",
+ //"rustc-ap-syntax",
];
let mut name_to_id: HashMap<_, Vec<_>> = HashMap::new();
for node in resolve.nodes.iter() {
|
