Skip to content

Rollup of 7 pull requests #68094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

Rollup of 7 pull requests #68094

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7c52718
Remove obsolete llvm_tools flag
cuviper Jan 8, 2020
51b7044
Build compiletest with in-tree libtest
cuviper Jan 8, 2020
686d5f8
Comment on allowing only feature(test) in compiletest
cuviper Jan 8, 2020
8267807
remove strip-hidden pass from compiler doc generation
euclio Jan 9, 2020
54f8601
Fix ICE #68058
JohnTitor Jan 9, 2020
870ca31
rustbuild: Cleanup book generation
ollie27 Jan 9, 2020
fcd850f
Do not ICE on unicode next point
estebank Jan 10, 2020
d5598aa
Introduce `#![feature(half_open_range_patterns)]`.
Centril Dec 11, 2019
8bd3d24
nix syntax::errors & prefer rustc_errors over errors
Centril Jan 9, 2020
822296b
Rollup merge of #67258 - Centril:open-ended-ranges, r=oli-obk
JohnTitor Jan 10, 2020
35905b9
Rollup merge of #68019 - cuviper:in-tree-compiletest, r=Mark-Simulacrum
JohnTitor Jan 10, 2020
02a0b7b
Rollup merge of #68039 - euclio:remove-strip-hidden, r=dtolnay
JohnTitor Jan 10, 2020
14d3658
Rollup merge of #68050 - Centril:canon-error, r=Mark-Simulacrum
JohnTitor Jan 10, 2020
b480a06
Rollup merge of #68072 - JohnTitor:fix-macro-ice, r=petrochenkov
JohnTitor Jan 10, 2020
5f7d23d
Rollup merge of #68075 - ollie27:rustbuild_books, r=Mark-Simulacrum
JohnTitor Jan 10, 2020
0d7a792
Rollup merge of #68084 - estebank:ice-68000, r=varkor
JohnTitor Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove obsolete llvm_tools flag
  • Loading branch information
@cuviper
cuviper committed Jan 8, 2020
commit 7c52718ba22179451bca76d246037a5f7480eae1
12 changes: 1 addition & 11 deletions src/bootstrap/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ fn rustbook_features() -> Vec<String> {
macro_rules! bootstrap_tool {
($(
$name:ident, $path:expr, $tool_name:expr
$(,llvm_tools = $llvm:expr)*
$(,is_external_tool = $external:expr)*
$(,features = $features:expr)*
;
Expand All @@ -301,15 +300,6 @@ macro_rules! bootstrap_tool {
)+
}

impl Tool {
/// Whether this tool requires LLVM to run
pub fn uses_llvm_tools(&self) -> bool {
match self {
$(Tool::$name => false $(|| $llvm)*,)+
}
}
}

impl<'a> Builder<'a> {
pub fn tool_exe(&self, tool: Tool) -> PathBuf {
match tool {
Expand Down Expand Up @@ -377,7 +367,7 @@ bootstrap_tool!(
Tidy, "src/tools/tidy", "tidy";
Linkchecker, "src/tools/linkchecker", "linkchecker";
CargoTest, "src/tools/cargotest", "cargotest";
Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
Compiletest, "src/tools/compiletest", "compiletest";
BuildManifest, "src/tools/build-manifest", "build-manifest";
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
Expand Down