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

Remove metadata only codegen backend #58847

Merged
merged 5 commits into from
Mar 18, 2019

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Mar 1, 2019

It is unused and probably broken at the moment.

@bjorn3 bjorn3 changed the title Remove metadata only cg Remove metadata only codegen backend Mar 1, 2019
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 1, 2019

📌 Commit 72dffcced14d7bb1db9ca0310e7a248046c32eff has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2019
@rust-highfive
Copy link
Collaborator

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:1084d672:start=1551455969973713154,finish=1551455970830388359,duration=856675205
$ 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:13:21] 
[01:13:21] running 119 tests
[01:13:45] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:13:50] i......iii.i.....ii
[01:13:50] 
[01:13:50]  finished in 28.804
[01:13:50] travis_fold:end:test_debuginfo

---
[01:35:46] 
[01:35:46] error: test failed, to rerun pass '--lib'
[01:35:46] 
[01:35:46] 
[01:35:46] 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:35:46] 
[01:35:46] 
[01:35:46] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:35:46] Build completed unsuccessfully in 0:33:57
[01:35:46] Build completed unsuccessfully in 0:33:57
[01:35:46] make: *** [check] Error 1
[01:35:46] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:16f60203
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri Mar  1 17:35:29 UTC 2019
---
travis_time:end:1d3bf98c:start=1551461730712359756,finish=1551461730716932921,duration=4573165
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2b4f048e
$ 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:007a1af0
travis_time:start:007a1af0
$ 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:21e4cfa2
$ 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)

@alexcrichton
Copy link
Member

@bors: r- delegate+

@bors
Copy link
Contributor

bors commented Mar 1, 2019

✌️ @bjorn3 can now approve this pull request

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2019
@bjorn3 bjorn3 force-pushed the remove_metadata_only_cg branch from 72dffcc to 4db55da Compare March 1, 2019 17:45
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 1, 2019

Removed commit 72dffcced14d7bb1db9ca0310e7a248046c32eff ([bootstrap] Remove llvm.enabled config) which was causing this.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Mar 1, 2019

📌 Commit 4db55da2bcd8356b38eeca7f4da587c81bb4b658 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2019
@rust-highfive
Copy link
Collaborator

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:147d2dd3:start=1551462432501123491,finish=1551462433402242789,duration=901119298
$ 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:15:32] 
[01:15:32] running 119 tests
[01:15:57] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:16:01] i......iii.i.....ii
[01:16:01] 
[01:16:01]  finished in 29.013
[01:16:01] travis_fold:end:test_debuginfo

---
[01:38:05] 
[01:38:05] error: test failed, to rerun pass '--lib'
[01:38:05] 
[01:38:05] 
[01:38:05] 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:38:05] 
[01:38:05] 
[01:38:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:38:05] Build completed unsuccessfully in 0:34:33
[01:38:05] Build completed unsuccessfully in 0:34:33
[01:38:05] make: *** [check] Error 1
[01:38:05] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0255482c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri Mar  1 19:25:29 UTC 2019
---
travis_time:end:1598e4db:start=1551468331035927668,finish=1551468331095536332,duration=59608664
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0dc6756e
$ 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:04871f00
$ 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)

@@ -109,9 +109,6 @@ pub fn get_codegen_backend(sess: &Session) -> Box<dyn CodegenBackend> {
let codegen_name = sess.opts.debugging_opts.codegen_backend.as_ref()
.unwrap_or(&sess.target.target.options.codegen_backend);
let backend = match &codegen_name[..] {
"metadata_only" => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're removing this here, I assume we also need to remove this below?

options.debugging_opts.codegen_backend = Some("metadata_only".to_owned());

This was introduced recently in 23a51f9
cc @Zoxc

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rustc_driver tests rely on the metadata-only backend since it can't find the real one. How is that resolved in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests in rustc_driver is an artifact of days long before 1.0 (just look at what they are doing - testing lifetime inference? in rustc_driver?).
They should be just removed at long last.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I get why it failed testing. I thought it was commit 72dffcc, which I removed after seeing the failing test. I will remove the tests from rustc_driver and reintroduce 72dffcc.

@kennytm
Copy link
Member

kennytm commented Mar 2, 2019

@bors r- Failed to test stage1 rustc_driver.

[01:38:05] error: failed to find a `codegen-backends` folder in the sysroot candidates:
[01:38:05] * /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release
[01:38:05] * /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2019
@rust-highfive
Copy link
Collaborator

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:0079a2e0:start=1551523585453596620,finish=1551523665999878472,duration=80546281852
$ 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:15:00] 
[01:15:00] running 119 tests
[01:15:25] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:15:29] i......iii.i.....ii
[01:15:29] 
[01:15:29]  finished in 29.586
[01:15:29] 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:42:00] 
[01:42:00] running 195 tests
[01:42:26] ..................i...i.......................................F.........................i........... 100/195
[01:43:11] ...................................................i......................................i....
[01:43:11] failures:
[01:43:11] 
[01:43:11] ---- [run-make] run-make-fulldeps/hotplug_codegen_backend stdout ----
[01:43:11] ---- [run-make] run-make-fulldeps/hotplug_codegen_backend stdout ----
[01:43:11] 
[01:43:11] error: make failed
[01:43:11] status: exit code: 2
[01:43:11] command: "make"
[01:43:11] stdout:
[01:43:11] ------------------------------------------
[01:43:11] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/hotplug_codegen_backend'
[01:43:11] /bin/echo || exit 0 # This test requires /bin/echo to exist
[01:43:11] 
[01:43:11] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend:/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/hotplug_codegen_backend/hotplug_codegen_backend -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend  the_backend.rs --crate-name the_backend --crate-type dylib \
[01:43:11]  -o /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend/the_backend.dylib
[01:43:11] Makefile:4: recipe for target 'all' failed
[01:43:11] make[1]: Leaving directory '/checkout/src/test/run-make-fulldeps/hotplug_codegen_backend'
[01:43:11] ------------------------------------------
[01:43:11] stderr:
[01:43:11] ------------------------------------------
[01:43:11] ------------------------------------------
[01:43:11] warning: ignoring --out-dir flag due to -o flag
[01:43:11] 
[01:43:11] error[E0432]: unresolved import `rustc_codegen_utils::codegen_backend::MetadataOnlyCodegenBackend`
[01:43:11]   --> the_backend.rs:16:60
[01:43:11]    |
[01:43:11] 16 | use rustc_codegen_utils::codegen_backend::{CodegenBackend, MetadataOnlyCodegenBackend};
[01:43:11]    |                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^ no `MetadataOnlyCodegenBackend` in `codegen_backend`
[01:43:11] error: aborting due to previous error
[01:43:11] 
[01:43:11] For more information about this error, try `rustc --explain E0432`.
[01:43:11] For more information about this error, try `rustc --explain E0432`.
[01:43:11] make[1]: *** [all] Error 1
[01:43:11] ------------------------------------------
[01:43:11] 
[01:43:11] thread '[run-make] run-make-fulldeps/hotplug_codegen_backend' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3295:9
[01:43:11] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---
[01:43:11] test result: FAILED. 189 passed; 1 failed; 5 ignored; 0 measured; 0 filtered out
[01:43:11] 
[01:43:11] 
[01:43:11] 
[01:43:11] 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:43:11] 
[01:43:11] 
[01:43:11] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:43:11] Build completed unsuccessfully in 0:39:56
[01:43:11] Build completed unsuccessfully in 0:39:56
[01:43:11] make: *** [check] Error 1
[01:43:11] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1216583c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Mar  2 12:31:06 UTC 2019
---
travis_time:end:08a25ba4:start=1551529868228305917,finish=1551529868290210775,duration=61904858
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:09791d6c
$ 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:04bdea67
$ 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)

@bors
Copy link
Contributor

bors commented Mar 2, 2019

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

@bjorn3 bjorn3 force-pushed the remove_metadata_only_cg branch from cc7ff4f to 8add308 Compare March 3, 2019 09:31
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 3, 2019

Rebased

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 3, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 16, 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 remove_metadata_only_cg (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 remove_metadata_only_cg --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)
Removing src/librustc_driver/test.rs
Auto-merging src/librustc_driver/lib.rs
Auto-merging src/librustc_codegen_utils/lib.rs
Auto-merging src/bootstrap/test.rs
Auto-merging src/bootstrap/builder.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 16, 2019
@bjorn3 bjorn3 force-pushed the remove_metadata_only_cg branch from aea0d50 to 0e0488f Compare March 16, 2019 10:00
@bjorn3
Copy link
Member Author

bjorn3 commented Mar 16, 2019

Rebased

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Mar 16, 2019

📌 Commit 0e0488f has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 16, 2019
@bors
Copy link
Contributor

bors commented Mar 18, 2019

⌛ Testing commit 0e0488f with merge 9b52c80...

bors added a commit that referenced this pull request Mar 18, 2019
Remove metadata only codegen backend

It is unused and probably broken at the moment.
@bors
Copy link
Contributor

bors commented Mar 18, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2019
@ljedrz
Copy link
Contributor

ljedrz commented Mar 18, 2019

spurious network error

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2019
@bors
Copy link
Contributor

bors commented Mar 18, 2019

⌛ Testing commit 0e0488f with merge 0f88167...

bors added a commit that referenced this pull request Mar 18, 2019
Remove metadata only codegen backend

It is unused and probably broken at the moment.
@bors
Copy link
Contributor

bors commented Mar 18, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 0f88167 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2019
@bors bors merged commit 0e0488f into rust-lang:master Mar 18, 2019
@bjorn3 bjorn3 deleted the remove_metadata_only_cg branch March 19, 2019 06:44
@bjorn3 bjorn3 mentioned this pull request Sep 8, 2020
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants