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

Introduce rustc_interface and move some methods there #58250

Open
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
7 participants
@Zoxc
Copy link
Contributor

Zoxc commented Feb 6, 2019

Split out from #56732

r? @oli-obk

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from a2f59bf to 72ba6f8 Feb 6, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:18c9218d:start=1549495777983132261,finish=1549495780528557231,duration=2545424970
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:08:07] 
[01:08:07] running 119 tests
[01:08:34] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:08:39] i......iii.i.....ii
[01:08:39] 
[01:08:39]  finished in 32.023
[01:08:39] travis_fold:end:test_debuginfo

---
[01:29:02]    Compiling rustc_driver v0.0.0 (/checkout/src/librustc_driver)
[01:29:03] error[E0425]: cannot find function `get_codegen_backend` in the crate root
[01:29:03]    --> src/librustc_driver/test.rs:115:32
[01:29:03]     |
[01:29:03] 115 |     let cstore = CStore::new(::get_codegen_backend(&sess).metadata_loader());
[01:29:03]     |                                ^^^^^^^^^^^^^^^^^^^ not found in the crate root
[01:29:03]     |
[01:29:03] 3   | use rustc_interface::util::get_codegen_backend;
[01:29:03]     |
[01:29:03] 
[01:29:03] 
[01:29:03] error[E0061]: this function takes 5 parameters but 4 parameters were supplied
[01:29:03]    --> src/librustc_driver/test.rs:109:16
[01:29:03]     |
[01:29:03] 109 |       let sess = session::build_session_(
[01:29:03] 110 | |         options,
[01:29:03] 111 | |         None,
[01:29:03] 112 | |         diagnostic_handler,
[01:29:03] 112 | |         diagnostic_handler,
[01:29:03] 113 | |         Lrc::new(SourceMap::new(FilePathMapping::empty())),
[01:29:03]     | |_____^ expected 5 parameters
[01:29:03] 
[01:29:03] error[E0061]: this function takes 12 parameters but 13 parameters were supplied
[01:29:03]    --> src/librustc_driver/test.rs:153:5
---
[01:29:04] 
[01:29:04] To learn more, run the command again with --verbose.
[01:29:04] 
[01:29:04] 
[01:29:04] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc_driver" "--" "--quiet"
[01:29:04] 
[01:29:04] 
[01:29:04] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:29:04] Build completed unsuccessfully in 0:32:40
[01:29:04] Build completed unsuccessfully in 0:32:40
[01:29:04] make: *** [check] Error 1
[01:29:04] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0e9d61b6
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 00:58:55 UTC 2019
---
travis_time:end:18b8c84b:start=1549501138002366362,finish=1549501138007142866,duration=4776504
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1031bf9a
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo travis_time:start:043ff9c0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:02a495a8
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch 2 times, most recently from 9d8d8d1 to 772325d Feb 7, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:003f6956:start=1549504940076743416,finish=1549504942224633523,duration=2147890107
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
$ pip install --user awscli; export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/__init__.py:83: RequestsDependencyWarning: Old version of cryptography ([1, 2, 3]) may cause slowdown.
  warnings.warn(warning, RequestsDependencyWarning)
Collecting awscli
  Downloading https://files.pythonhosted.org/packages/cd/29/4f5cee313320f0c284d83c0111bd5b3a26398316d09df3daf883354c9554/awscli-1.16.99-py2.py3-none-any.whl (1.4MB)
    1% |▌                               | 20kB 2.1MB/s eta 0:00:01
    2% |▊                               | 30kB 3.1MB/s eta 0:00:01
    2% |█                               | 40kB 2.1MB/s eta 0:00:01
    3% |█▏                              | 51kB 2.5MB/s eta 0:00:01
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:12:48] 
[01:12:48] running 119 tests
[01:13:13] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:13:17] i......iii.i.....ii
[01:13:17] 
[01:13:17]  finished in 29.602
[01:13:17] travis_fold:end:test_debuginfo

---
travis_time:start:test_run-make-fulldeps
Check compiletest suite=run-make-fulldeps mode=run-make (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:39:12] 
[01:39:12] running 194 tests
[01:39:38] ......................i.............................................F............................... 100/194
[01:40:23] failures:
[01:40:23] 
[01:40:23] ---- [run-make] run-make-fulldeps/issue-19371 stdout ----
[01:40:23] 
[01:40:23] 
[01:40:23] error: make failed
[01:40:23] status: exit code: 2
[01:40:23] command: "make"
[01:40:23] stdout:
[01:40:23] ------------------------------------------
[01:40:23] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/issue-19371'
[01:40:23] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/issue-19371/issue-19371:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/issue-19371/issue-19371 -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/issue-19371/issue-19371  foo.rs
[01:40:23] Makefile:8: recipe for target 'all' failed
[01:40:23] make[1]: Leaving directory '/checkout/src/test/run-make-fulldeps/issue-19371'
[01:40:23] ------------------------------------------
[01:40:23] stderr:
[01:40:23] ------------------------------------------
[01:40:23] error[E0425]: cannot find function `get_codegen_backend` in module `rustc_driver`
[01:40:23] error[E0425]: cannot find function `get_codegen_backend` in module `rustc_driver`
[01:40:23]   --> foo.rs:48:41
[01:40:23]    |
[01:40:23] 48 |     let codegen_backend = rustc_driver::get_codegen_backend(&sess);
[01:40:23]    |                                         ^^^^^^^^^^^^^^^^^^^ not found in `rustc_driver`
[01:40:23] error: aborting due to previous error
[01:40:23] 
[01:40:23] For more information about this error, try `rustc --explain E0425`.
[01:40:23] For more information about this error, try `rustc --explain E0425`.
[01:40:23] make[1]: *** [all] Error 1
[01:40:23] ------------------------------------------
[01:40:23] 
[01:40:23] thread '[run-make] run-make-fulldeps/issue-19371' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3295:9
[01:40:23] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---
[01:40:23] 
[01:40:23] 
[01:40:23] 
[01:40:23] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:502:22
[01:40:23] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64asmprinter aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils all all-targets amdgpu amdgpuasmparser amdgpuasmprinter amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armasmprinter armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitwriter bpf bpfasmparser bpfasmprinter bpfcodegen bpfdesc bpfdisassembler bpfinfo codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader lanai lanaiasmparser lanaiasmprinter lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mips mipsasmparser mipsasmprinter mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmprinter msp430codegen msp430desc msp430info native nativecodegen nvptx nvptxasmprinter nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpcasmprinter powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata runtimedyld scalaropts selectiondag sparc sparcasmparser sparcasmprinter sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzasmprinter systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target transformutils vectorize windowsmanifest x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils xcore xcoreasmprinter xcorecodegen xcoredesc xcoredisassembler xcoreinfo" "--llvm-cxxflags" "-I/usr/lib/llvm-6.0/include -std=c++0x -fuse-ld=gold -Wl,--no-keep-files-mapped -Wl,--no-map-whole-files -fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -ffunction-sections -fdata-sections -O2 -DNDEBUG  -fno-exceptions -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:40:23] 
[01:40:23] 
[01:40:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:40:23] Build completed unsuccessfully in 0:39:22
[01:40:23] Build completed unsuccessfully in 0:39:22
[01:40:23] Makefile:48: recipe for target 'check' failed
[01:40:23] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0c3d2f30
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 03:42:55 UTC 2019

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from 772325d to a7f0143 Feb 7, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:15724698:start=1549511838290054567,finish=1549511840439953983,duration=2149899416
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:29] 
[01:10:29] running 119 tests
[01:10:54] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:10:59] i......iii.i.....ii
[01:10:59] 
[01:10:59]  finished in 29.288
[01:10:59] travis_fold:end:test_debuginfo

---
Check compiletest suite=rustdoc-ui mode=ui (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:38:29] 
[01:38:29] running 14 tests
[01:38:34] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:502:22
[01:38:34] ...F..........
[01:38:34] 
[01:38:34] ---- [ui] rustdoc-ui/failed-doctest-output.rs stdout ----
[01:38:34] diff of stdout:
[01:38:34] 
[01:38:34] 
[01:38:34] 12 3 | no
[01:38:34] 13   | ^^ not found in this scope
[01:38:34] 14 
[01:38:34] - thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:354:13
[01:38:34] + thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:355:13
[01:38:34] 17 
[01:38:34] 17 
[01:38:34] 18 ---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
[01:38:34] 
[01:38:34] 21 thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1
[01:38:34] 23 
[01:38:34] - ', src/librustdoc/test.rs:389:17
[01:38:34] + ', src/librustdoc/test.rs:390:17
[01:38:34] 25 
[01:38:34] 25 
[01:38:34] 26 
[01:38:34] 27 failures:
[01:38:34] 
[01:38:34] 
[01:38:34] The actual stdout differed from the expected stdout.
[01:38:34] Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/failed-doctest-output.stdout
[01:38:34] To update references, rerun the tests and pass the `--bless` flag
[01:38:34] To only update this specific test, also pass `--test-args failed-doctest-output.rs`
[01:38:34] error: 1 errors occurred comparing output.
[01:38:34] status: exit code: 101
[01:38:34] status: exit code: 101
[01:38:34] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "/checkout/src/test/rustdoc-ui/failed-doctest-output.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/a" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/auxiliary"
[01:38:34] ------------------------------------------
[01:38:34] 
[01:38:34] running 2 tests
[01:38:34] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) ... FAILED
[01:38:34] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) ... FAILED
[01:38:34] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11) ... FAILED
[01:38:34] failures:
[01:38:34] 
[01:38:34] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) stdout ----
[01:38:34] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) stdout ----
[01:38:34] error[E0425]: cannot find value `no` in this scope
[01:38:34]   |
[01:38:34] 3 | no
[01:38:34]   | ^^ not found in this scope
[01:38:34] 
[01:38:34] 
[01:38:34] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:355:13
[01:38:34] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:38:34] 
[01:38:34] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
[01:38:34] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11)' panicked at 'test executable failed:
[01:38:34] 
[01:38:34] thread 'main' panicked at 'oh no', /checkout/src/test/rustdoc-ui/failed-doctest-output.rs:3:1
[01:38:34] 
[01:38:34] ', src/librustdoc/test.rs:390:17
[01:38:34] 
[01:38:34] 
[01:38:34] 
[01:38:34] failures:
[01:38:34]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17)
[01:38:34]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11)
[01:38:34] test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
[01:38:34] 
[01:38:34] 
[01:38:34] ------------------------------------------
---
[01:38:34] test result: FAILED. 13 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:38:34] 
[01:38:34] 
[01:38:34] 
[01:38:34] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/rustdoc-ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:38:34] 
[01:38:34] 
[01:38:34] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:38:34] Build completed unsuccessfully in 0:39:34
[01:38:34] Build completed unsuccessfully in 0:39:34
[01:38:34] make: *** [check] Error 1
[01:38:34] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:15eb4d25
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 05:36:05 UTC 2019
---
travis_time:end:158c8358:start=1549517766971070902,finish=1549517767025900131,duration=54829229
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:2479b3e0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00fae358
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from a7f0143 to fc02bd0 Feb 7, 2019

}

pub fn collect_crate_types(session: &Session, attrs: &[ast::Attribute]) -> Vec<config::CrateType> {
// Unconditionally collect crate types from attributes to make them used

This comment has been minimized.

@phansch

phansch Feb 7, 2019

Contributor

Should this be a doc comment?

This comment has been minimized.

@Zoxc

Zoxc Feb 7, 2019

Author Contributor

I don't think so

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0865c396:start=1549518016251258386,finish=1549518186943784646,duration=170692526260
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:11:39] 
[01:11:39] running 119 tests
[01:12:05] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:12:09] i......iii.i.....ii
[01:12:09] 
[01:12:09]  finished in 29.986
[01:12:09] travis_fold:end:test_debuginfo

---
travis_time:start:test_rustdoc-ui
Check compiletest suite=rustdoc-ui mode=ui (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:40:41] 
[01:40:41] running 14 tests
[01:40:46] ..F...........
[01:40:46] failures:
[01:40:46] 
[01:40:46] ---- [ui] rustdoc-ui/failed-doctest-output.rs stdout ----
[01:40:46] diff of stdout:
[01:40:46] diff of stdout:
[01:40:46] 
[01:40:46] 21 thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1
[01:40:46] 23 
[01:40:46] - ', src/librustdoc/test.rs:389:17
[01:40:46] + ', src/librustdoc/test.rs:390:17
[01:40:46] 25 
[01:40:46] 25 
[01:40:46] 26 
[01:40:46] 27 failures:
[01:40:46] 
[01:40:46] 
[01:40:46] The actual stdout differed from the expected stdout.
[01:40:46] Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/failed-doctest-output.stdout
[01:40:46] To update references, rerun the tests and pass the `--bless` flag
[01:40:46] To only update this specific test, also pass `--test-args failed-doctest-output.rs`
[01:40:46] error: 1 errors occurred comparing output.
[01:40:46] status: exit code: 101
[01:40:46] status: exit code: 101
[01:40:46] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "/checkout/src/test/rustdoc-ui/failed-doctest-output.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/a" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/auxiliary"
[01:40:46] ------------------------------------------
[01:40:46] 
[01:40:46] running 2 tests
[01:40:46] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) ... FAILED
[01:40:46] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) ... FAILED
[01:40:46] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11) ... FAILED
[01:40:46] failures:
[01:40:46] 
[01:40:46] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) stdout ----
[01:40:46] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17) stdout ----
[01:40:46] error[E0425]: cannot find value `no` in this scope
[01:40:46]   |
[01:40:46] 3 | no
[01:40:46]   | ^^ not found in this scope
[01:40:46] 
[01:40:46] 
[01:40:46] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:355:13
[01:40:46] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:40:46] 
[01:40:46] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
[01:40:46] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11)' panicked at 'test executable failed:
[01:40:46] 
[01:40:46] thread 'main' panicked at 'oh no', /checkout/src/test/rustdoc-ui/failed-doctest-output.rs:3:1
[01:40:46] 
[01:40:46] ', src/librustdoc/test.rs:390:17
[01:40:46] 
[01:40:46] 
[01:40:46] 
[01:40:46] failures:
[01:40:46]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 17)
[01:40:46]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 11)
[01:40:46] test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
[01:40:46] 
[01:40:46] 
[01:40:46] ------------------------------------------
---
[01:40:46] test result: FAILED. 13 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:40:46] 
[01:40:46] 
[01:40:46] 
[01:40:46] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/rustdoc-ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:40:46] 
[01:40:46] 
[01:40:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:40:46] Build completed unsuccessfully in 0:40:48
[01:40:46] Build completed unsuccessfully in 0:40:48
[01:40:46] make: *** [check] Error 1
[01:40:46] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:388487ac
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 07:24:02 UTC 2019
---
travis_time:end:08643a82:start=1549524244408165122,finish=1549524244413081504,duration=4916382
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2bdec07d
$ ln -s . checkout && for CORE in obj/cores/c

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from fc02bd0 to 0fafff9 Feb 7, 2019

@oli-obk
Copy link
Contributor

oli-obk left a comment

r=me with nits fixed

@@ -1282,8 +1282,6 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {

let gcx = arenas.global_ctxt.as_ref().unwrap();

sync::assert_send_val(&gcx);

This comment has been minimized.

@oli-obk

oli-obk Feb 7, 2019

Contributor

Why did you remove this?

This comment has been minimized.

@oli-obk

oli-obk Feb 7, 2019

Contributor

And/or why was this there at all?

This comment has been minimized.

@Zoxc

Zoxc Feb 7, 2019

Author Contributor

It was there after we modified GlobalCtxt to be Sync, but didn't yet actually share it across threads.

@@ -148,6 +118,13 @@ const ICE_REPORT_COMPILER_FLAGS_EXCLUDE: &[&str] = &["metadata", "extra-filename

const ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE: &[&str] = &["incremental"];

pub fn source_name(input: &Input) -> FileName {

This comment has been minimized.

@oli-obk

oli-obk Feb 7, 2019

Contributor

This should be a method on Input

This comment has been minimized.

@oli-obk

oli-obk Feb 7, 2019

Contributor

A doc comment would be neat, too

use std::mem;
use std::ops::Generator;

// Returns all the paths that correspond to generated files.

This comment has been minimized.

@oli-obk

oli-obk Feb 7, 2019

Contributor
Suggested change Beta
// Returns all the paths that correspond to generated files.
/// Returns all the paths that correspond to generated files.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 7, 2019

☔️ The latest upstream changes (presumably #58254) made this pull request unmergeable. Please resolve the merge conflicts.

time(sess, "intrinsic checking", || {
middle::intrinsicck::check_crate(tcx)
});
tcx.analysis(LOCAL_CRATE).ok();

This comment has been minimized.

@bjorn3

bjorn3 Feb 7, 2019

Contributor

This should return the error, shouldnt't it.

This comment has been minimized.

@Zoxc

Zoxc Feb 7, 2019

Author Contributor

We pass the compile status to the closure and expect it to handle it. I'll change phase_3_run_analysis_passes to return just R.

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from 0fafff9 to 024f7d5 Feb 7, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:13656db4:start=1549570665664060566,finish=1549570667929761829,duration=2265701263
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:24:08] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:24:08] expected success, got: exit code: 101
[00:24:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:24:08] Build completed unsuccessfully in 0:19:19
[00:24:08] make: *** [all] Error 1
[00:24:08] Makefile:18: recipe for target 'all' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:02a0a8d8
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 20:42:06 UTC 2019
---
travis_fold:end:after_failure.1
travis_fold:start:after_failure.2
travis_time:start:080d1b13
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot acng_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1b23aa2b
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from d7d0cec to 9e4ec00 Feb 7, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Feb 7, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 7, 2019

📌 Commit 9e4ec00 has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

☔️ The latest upstream changes (presumably #58389) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from 9e4ec00 to 356da36 Feb 12, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 12, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:1073c4b2:start=1549962831646985852,finish=1549962834386003846,duration=2739017994
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:02:27] 
######################################################################## 100.0%
[00:02:28] extracting /checkout/obj/build/cache/2019-01-18/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:28]     Updating crates.io index
[00:02:45] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:45] Build completed unsuccessfully in 0:00:59
[00:02:45] Makefile:70: recipe for target 'prepare' failed
[00:02:45] make: *** [prepare] Error 1
[00:02:46] Command failed. Attempt 2/5:
[00:02:46] Command failed. Attempt 2/5:
[00:02:46] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:46] Build completed unsuccessfully in 0:00:00
[00:02:46] make: *** [prepare] Error 1
[00:02:46] Makefile:70: recipe for target 'prepare' failed
[00:02:48] Command failed. Attempt 3/5:
[00:02:48] Command failed. Attempt 3/5:
[00:02:48] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:48] Build completed unsuccessfully in 0:00:00
[00:02:48] Makefile:70: recipe for target 'prepare' failed
[00:02:48] make: *** [prepare] Error 1
[00:02:51] Command failed. Attempt 4/5:
[00:02:51] Command failed. Attempt 4/5:
[00:02:52] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:52] Build completed unsuccessfully in 0:00:00
[00:02:52] make: *** [prepare] Error 1
[00:02:52] Makefile:70: recipe for target 'prepare' failed
[00:02:56] Command failed. Attempt 5/5:
[00:02:56] Command failed. Attempt 5/5:
[00:02:56] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:56] Build completed unsuccessfully in 0:00:00
[00:02:56] Makefile:70: recipe for target 'prepare' failed
[00:02:56] make: *** [prepare] Error 1
[00:02:56] The command has failed after 5 attempts.
---
travis_time:end:0a0df532:start=1549963023338060582,finish=1549963023342592626,duration=4532044
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:057d5054
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:2d7e4641
travis_time:start:2d7e4641
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:02f553a3
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from 356da36 to 0e4fa4f Feb 12, 2019

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

☔️ The latest upstream changes (presumably #58341) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from 0e4fa4f to db17b31 Feb 13, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Feb 13, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 13, 2019

📌 Commit db17b31 has been approved by oli-obk

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Feb 13, 2019

@Zoxc Can you please follow this PR up with one that converts the new crate to Rust 2018?

Centril added a commit to Centril/rust that referenced this pull request Feb 14, 2019

Rollup merge of rust-lang#58250 - Zoxc:rustc-interface-1, r=oli-obk
Introduce rustc_interface and move some methods there

Split out from rust-lang#56732

r? @oli-obk
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 15, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rustc-interface-1 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rustc-interface-1 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_typeck/lib.rs
Auto-merging src/librustc_typeck/check/mod.rs
Auto-merging src/librustc_driver/driver.rs
Auto-merging src/librustc/ty/query/plumbing.rs
Auto-merging src/librustc/ty/query/mod.rs
Auto-merging src/librustc/ty/context.rs
Auto-merging src/librustc/session/mod.rs
Auto-merging src/librustc/session/config.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from db17b31 to edc9e99 Feb 16, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Feb 16, 2019

@Centril Maybe after #56732 lands

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Feb 16, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 16, 2019

📌 Commit edc9e99 has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 19, 2019

☔️ The latest upstream changes (presumably #56514) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc Zoxc force-pushed the Zoxc:rustc-interface-1 branch from edc9e99 to 54e70ba Feb 19, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Feb 20, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 20, 2019

📌 Commit 54e70ba has been approved by oli-obk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment