Skip to content
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.

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

Rollup of 7 pull requests #64264

Merged
merged 25 commits into from
Sep 7, 2019
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5da1123
Update zx_time_t to an i64
tmandry Aug 30, 2019
403701f
Don't try to use /dev/null on Fuchsia
tmandry Aug 30, 2019
7bfa2be
fuchsia: Don't fail to spawn if no stdin exists
tmandry Aug 31, 2019
5f91ad0
fuchsia: Fix default environment behavior when spawning
tmandry Aug 31, 2019
c86ea34
Ensure all warnings are emitted even on warnings=warn
Mark-Simulacrum Sep 2, 2019
fda251b
Rename --warnings=allow to --warnings=warn
Mark-Simulacrum Sep 2, 2019
74563b4
Restrict error code length to 80 columns
Mark-Simulacrum Sep 4, 2019
b437240
Replace diagnostic plugins with macro_rules
Mark-Simulacrum Sep 4, 2019
3f1dc32
Remove codegen dependencies
Mark-Simulacrum Sep 4, 2019
4de4f30
Fix error index generator for new register_diagnostics API
Mark-Simulacrum Sep 4, 2019
41b39fc
Remove rustc_diagnostic_macros feature
Mark-Simulacrum Sep 4, 2019
5153db1
Explicitly create test tempdir
Mark-Simulacrum Sep 5, 2019
8ddbe76
Upgrade env_logger to 0.6
mati865 Aug 29, 2019
c1d29ee
Aggregation of cosmetic changes made during work on REPL PRs: librustc
alexreg Sep 6, 2019
fd48ca2
Apply suggestions from code review
alexreg Sep 6, 2019
49d2fd1
Aggregation of cosmetic changes made during work on REPL PRs: libsyntax
alexreg Sep 6, 2019
553a56d
Apply suggestions from code review
alexreg Sep 6, 2019
2bcabf6
compiletest: Match suffixed environments
smaeul Sep 3, 2019
8bee18b
Rollup merge of #64023 - tmandry:libstd-fuchsia-fixes, r=cramertj
Centril Sep 7, 2019
3c4a586
Rollup merge of #64098 - Mark-Simulacrum:always-warn, r=alexcrichton
Centril Sep 7, 2019
89a69fd
Rollup merge of #64139 - Mark-Simulacrum:strip-legacy-proc-macro, r=p…
Centril Sep 7, 2019
c530672
Rollup merge of #64226 - alexreg:rush-pr-3, r=centril
Centril Sep 7, 2019
c70b768
Rollup merge of #64227 - alexreg:rush-pr-4, r=centril
Centril Sep 7, 2019
448b38f
Rollup merge of #64235 - mati865:env_logger, r=alexcrichton
Centril Sep 7, 2019
635c3bc
Rollup merge of #64258 - smaeul:patch/arm-tests, r=Mark-Simulacrum
Centril Sep 7, 2019
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
Prev Previous commit
Next Next commit
Remove codegen dependencies
Not doing this leads to building two copies of e.g. num_cpus in the
sysroot and _llvm deps, leading to conflicts between the two when
compiling librustc_codegen_llvm. It's not entirely clear why this is the
case after the changes in this PR but likely has something to do with a
subtle difference in ordering or similar.
Mark-Simulacrum committed Sep 5, 2019
commit 3f1dc326edee5528db80894eedd2036fdc05bca8
4 changes: 0 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
@@ -3129,11 +3129,7 @@ dependencies = [
name = "rustc_codegen_llvm"
version = "0.0.0"
dependencies = [
"cc",
"memmap",
"num_cpus",
"rustc_llvm",
"tempfile",
]

[[package]]
4 changes: 0 additions & 4 deletions src/librustc_codegen_llvm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,11 +11,7 @@ crate-type = ["dylib"]
test = false

[dependencies]
cc = "1.0.1" # Used to locate MSVC
num_cpus = "1.0"
tempfile = "3.0"
rustc_llvm = { path = "../librustc_llvm" }
memmap = "0.6"

[features]
# This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm`