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
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 2 Oct 2021 01:07:59 +0100
Subject: d-0000-ignore-removed-submodules
---
Cargo.toml | 7 -----
src/bootstrap/bootstrap.py | 6 +----
src/bootstrap/builder.rs | 54 +++++++++-----------------------------
src/bootstrap/test.rs | 12 +--------
src/tools/rust-analyzer/Cargo.toml | 11 +++++++-
5 files changed, 25 insertions(+), 65 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 20b1c65..16d4ebe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,22 +20,15 @@ members = [
"src/tools/tidy",
"src/tools/tier-check",
"src/tools/build-manifest",
- "src/tools/remote-test-client",
- "src/tools/remote-test-server",
"src/tools/rust-installer",
"src/tools/rust-demangler",
"src/tools/rustdoc",
- "src/tools/rls",
"src/tools/rustfmt",
- "src/tools/miri",
- "src/tools/miri/cargo-miri",
"src/tools/rustdoc-themes",
"src/tools/unicode-table-generator",
- "src/tools/expand-yaml-anchors",
"src/tools/jsondocck",
"src/tools/jsondoclint",
"src/tools/html-checker",
- "src/tools/bump-stage0",
"src/tools/replace-version-placeholder",
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 149350e..2813c89 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -946,10 +946,6 @@ class RustBuild(object):
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
args.extend("--verbose" for _ in range(self.verbose))
- if self.use_locked_deps:
- args.append("--locked")
- if self.use_vendored_sources:
- args.append("--frozen")
if self.get_toml("metrics", "build"):
args.append("--features")
args.append("build-metrics")
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 05b66f9..ff1f0eb 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> {
static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
let init_submodules_paths = |src: &PathBuf| {
- let file = File::open(src.join(".gitmodules")).unwrap();
+ //let file = File::open(src.join(".gitmodules")).unwrap();
let mut submodules_paths = vec![];
- for line in BufReader::new(file).lines() {
- if let Ok(line) = line {
- let line = line.trim();
-
- if line.starts_with("path") {
- let actual_path =
- line.split(' ').last().expect("Couldn't get value of path");
- submodules_paths.push(actual_path.to_owned());
- }
- }
- }
+ //for line in BufReader::new(file).lines() {
+ // if let Ok(line) = line {
+ // let line = line.trim();
+
+ // if line.starts_with("path") {
+ // let actual_path =
+ // line.split(' ').last().expect("Couldn't get value of path");
+ // submodules_paths.push(actual_path.to_owned());
+ // }
+ // }
+ //}
submodules_paths
};
@@ -646,25 +646,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker,
tool::CargoTest,
tool::Compiletest,
- tool::RemoteTestServer,
- tool::RemoteTestClient,
tool::RustInstaller,
tool::Cargo,
- tool::Rls,
- tool::RustAnalyzer,
tool::RustAnalyzerProcMacroSrv,
tool::RustDemangler,
tool::Rustdoc,
tool::Clippy,
tool::CargoClippy,
- llvm::Llvm,
- llvm::Sanitizers,
tool::Rustfmt,
- tool::Miri,
- tool::CargoMiri,
- llvm::Lld,
- llvm::CrtBeginEnd,
- tool::RustdocGUITest,
),
Kind::Check | Kind::Clippy | Kind::Fix => describe!(
check::Std,
@@ -672,12 +661,7 @@ impl<'a> Builder<'a> {
check::Rustdoc,
check::CodegenBackend,
check::Clippy,
- check::Miri,
- check::CargoMiri,
- check::MiroptTestTools,
- check::Rls,
check::Rustfmt,
- check::RustAnalyzer,
check::Bootstrap
),
Kind::Test => describe!(
@@ -706,7 +690,6 @@ impl<'a> Builder<'a> {
test::TierCheck,
test::Cargotest,
test::Cargo,
- test::RustAnalyzer,
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
@@ -722,7 +705,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook,
test::EditionGuide,
test::Rustfmt,
- test::Miri,
test::Clippy,
test::RustDemangler,
test::CompiletestTest,
@@ -759,7 +741,6 @@ impl<'a> Builder<'a> {
doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
- doc::Miri,
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
@@ -777,12 +758,9 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
- dist::Rls,
- dist::RustAnalyzer,
dist::Rustfmt,
dist::RustDemangler,
dist::Clippy,
- dist::Miri,
dist::LlvmTools,
dist::RustDev,
dist::Bootstrap,
@@ -799,11 +777,9 @@ impl<'a> Builder<'a> {
install::Docs,
install::Std,
install::Cargo,
- install::RustAnalyzer,
install::Rustfmt,
install::RustDemangler,
install::Clippy,
- install::Miri,
install::LlvmTools,
install::Src,
install::Rustc
@@ -813,7 +789,6 @@ impl<'a> Builder<'a> {
run::BuildManifest,
run::BumpStage0,
run::ReplaceVersionPlaceholder,
- run::Miri,
run::CollectLicenseMetadata,
run::GenerateCopyright,
run::GenerateWindowsSys,
@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> {
}
}
- if self.config.locked_deps {
- cargo.arg("--locked");
- }
- if self.config.vendor || self.is_sudo {
+ if self.is_sudo {
cargo.arg("--frozen");
}
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index eed7a58..c3bf972 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -2129,17 +2129,7 @@ impl Step for RustcGuide {
}
fn run(self, builder: &Builder<'_>) {
- let relative_path = Path::new("src").join("doc").join("rustc-dev-guide");
- builder.update_submodule(&relative_path);
-
- let src = builder.src.join(relative_path);
- let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() {
- ToolState::TestPass
- } else {
- ToolState::TestFail
- };
- builder.save_toolstate("rustc-dev-guide", toolstate);
+ builder.save_toolstate("rustc-dev-guide", ToolState::TestPass);
}
}
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
index 3050cf7..174e1f0 100644
--- a/src/tools/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/Cargo.toml
@@ -1,5 +1,14 @@
[workspace]
-members = ["xtask/", "lib/*", "crates/*"]
+members = [
+ "xtask/",
+ "lib/*",
+ "crates/proc-macro-srv",
+ "crates/proc-macro-srv-cli",
+ "crates/tt",
+ "crates/mbe",
+ "crates/paths",
+ "crates/proc-macro-api",
+]
exclude = ["crates/proc-macro-test/imp"]
resolver = "2"
|
