Remove crate_type and crate_name attributes from compiler crates #41706

daniellockyer · 2017-05-02T14:36:30Z

rust-highfive · 2017-05-02T14:36:44Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

aidanhs · 2017-05-03T19:41:10Z

Hi @neosilky, thanks for the PR! We'll check back now and again to make sure @brson or another reviewer gets to this soon.

Mark-Simulacrum · 2017-05-07T00:37:05Z

@brson Checking in, could you review this PR?

cc @alexcrichton

brson · 2017-05-07T00:44:33Z

@bors r+ thanks @neosilky !

bors · 2017-05-07T00:44:34Z

📌 Commit f3cee21 has been approved by brson

brson · 2017-05-07T00:45:31Z

Travis failure is spurious.

bors · 2017-05-07T05:24:55Z

⌛ Testing commit f3cee21 with merge fbd491e...

bors · 2017-05-07T05:34:50Z

💔 Test failed - status-appveyor

Mark-Simulacrum · 2017-05-07T11:41:42Z

src/rtstartup/rsend.rs

@@ -11,7 +11,6 @@
 // See rsbegin.rs for details.

 #![feature(no_core, lang_items, optin_builtin_traits)]
-#![crate_type="rlib"]


This needs to be re-added, as there is no associated Cargo.toml.

Mark-Simulacrum · 2017-05-07T11:41:45Z

src/rtstartup/rsbegin.rs

@@ -23,7 +23,6 @@
 // of other runtime components (registered via yet another special image section).

 #![feature(no_core, lang_items, optin_builtin_traits)]
-#![crate_type="rlib"]


This needs to be re-added, as there is no associated Cargo.toml.

Mark-Simulacrum · 2017-05-07T11:42:24Z

@neosilky Found a few more problems, but I think those should be the last things.

daniellockyer · 2017-05-08T08:26:15Z

@Mark-Simulacrum Ah yes! I've re-added in the latest commit.

Mark-Simulacrum · 2017-05-08T11:09:56Z

@brson I think this is ready for another review. Could you take a look?

carols10cents · 2017-05-08T14:33:56Z

Looks like there's a test failure?

[00:50:31] failures:
[00:50:31] 
[00:50:31] ---- [run-make] run-make/alloc-extern-crates stdout ----
[00:50:31] 	
[00:50:31] error: make failed
[00:50:31] status: exit code: 2
[00:50:31] command: "make"
[00:50:31] stdout:
[00:50:31] ------------------------------------------
[00:50:31] make[1]: Entering directory '/checkout/src/test/run-make/alloc-extern-crates'
[00:50:31] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/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/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu  fakealloc.rs
[00:50:31] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/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/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu  ../../../liballoc/lib.rs --cfg feature=\"external_crate\" --extern external=/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu/libfakealloc.rlib
[00:50:31] thread 'main' panicked at 'Some tests failed', /checkout/src/tools/compiletest/src/main.rs:315
[00:50:31] Makefile:4: recipe for target 'all' failed
[00:50:31] make[1]: Leaving directory '/checkout/src/test/run-make/alloc-extern-crates'
[00:50:31] 
[00:50:31] ------------------------------------------
[00:50:31] stderr:
[00:50:31] ------------------------------------------
[00:50:31] make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
[00:50:31] error: language item required, but not found: `panic_fmt`
[00:50:31] 
[00:50:31] error: language item required, but not found: `eh_personality`
[00:50:31] 
[00:50:31] error: aborting due to 2 previous errors
[00:50:31] 
[00:50:31] make[1]: *** [all] Error 101
[00:50:31] 
[00:50:31] ------------------------------------------
[00:50:31] 
[00:50:31] thread '[run-make] run-make/alloc-extern-crates' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2467
[00:50:31] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:31] 
[00:50:31] 
[00:50:31] failures:
[00:50:31]     [run-make] run-make/alloc-extern-crates
[00:50:31] 
[00:50:31] test result: FAILED. 149 passed; 1 failed; 0 ignored; 0 measured

bors · 2017-05-13T07:54:13Z

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

arielb1 · 2017-05-16T18:43:07Z

Nice PR, @neosilky! There are however some test failures. Do you need help fixing them?

bors · 2017-05-21T04:32:53Z

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

arielb1 · 2017-05-23T22:20:27Z

compilation failure:

[00:03:07] error[E0432]: unresolved import `Substitution`
[00:03:07]   --> /checkout/src/librustc_errors/diagnostic.rs:12:5
[00:03:07]    |
[00:03:07] 12 | use Substitution;
[00:03:07]    |     ^^^^^^^^^^^^ no `Substitution` in the root
[00:03:07] 
[00:03:07] error[E0560]: struct `CodeSuggestion` has no field named `substitution_parts`
[00:03:07]    --> /checkout/src/librustc_errors/diagnostic.rs:209:13
[00:03:07]     |
[00:03:07] 209 |             substitution_parts: vec![Substitution {
[00:03:07]     |             ^^^^^^^^^^^^^^^^^^^ field does not exist - did you mean `substitutes`?
[00:03:07] 
[00:03:07] error[E0560]: struct `CodeSuggestion` has no field named `substitution_parts`
[00:03:07]    --> /checkout/src/librustc_errors/diagnostic.rs:220:13
[00:03:07]     |
[00:03:07] 220 |             substitution_parts: vec![Substitution {
[00:03:07]     |             ^^^^^^^^^^^^^^^^^^^ field does not exist - did you mean `substitutes`?
[00:03:07] 
[00:03:07] error: no field `substitution_parts` on type `&CodeSuggestion`
[00:03:07]   --> /checkout/src/librustc_errors/emitter.rs:41:21
[00:03:07]    |
[00:03:07] 41 |                sugg.substitution_parts.len() == 1 &&
[00:03:07]    |                     ^^^^^^^^^^^^^^^^^^
[00:03:07]

Are you working on this @neosilky? Need any help?

arielb1 · 2017-05-23T22:21:37Z

Feel free to ask for help on IRC (on #rust-internals or #rustc) - you can ping me (arielb1/arielby) personally.

daniellockyer · 2017-05-24T09:55:30Z

Sorry @arielb1, I'm just prepping for an exam tomorrow... I will fix this up after then!

No longer relevant.

aidanhs · 2017-06-01T00:29:46Z

Hi @neosilky, just want to make sure this hasn't dropped off your radar! Do you think you'll get time to look at it?

See issue #41701.

Mark-Simulacrum · 2017-06-11T16:22:33Z

Hm, that same test failure that @arielb1 noticed is still present, and I'm not actually quite sure why. @arielb1 is there a chance you could investigate and comment here?

arielb1 · 2017-06-13T20:44:45Z

Taking a fresh look at the test failure, which is:

[00:45:34] ---- [run-make] run-make/alloc-extern-crates stdout ----
[00:45:34] 	
[00:45:34] error: make failed
[00:45:34] status: exit code: 2
[00:45:34] command: "make"
[00:45:34] stdout:
[00:45:34] ------------------------------------------
[00:45:34] make[1]: Entering directory '/checkout/src/test/run-make/alloc-extern-crates'
[00:45:34] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/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/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu  fakealloc.rs
[00:45:34] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/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/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu  ../../../liballoc/lib.rs --cfg feature=\"external_crate\" --extern external=/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/alloc-extern-crates.stage2-x86_64-unknown-linux-gnu/libfakealloc.rlib
[00:45:34] Makefile:4: recipe for target 'all' failed
[00:45:34] make[1]: Leaving directory '/checkout/src/test/run-make/alloc-extern-crates'
[00:45:34] 
[00:45:34] ------------------------------------------
[00:45:34] stderr:
[00:45:34] ------------------------------------------
[00:45:34] make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
[00:45:34] error: language item required, but not found: `panic_fmt`
[00:45:34] 
[00:45:34] error: language item required, but not found: `eh_personality`
[00:45:34] 
[00:45:34] error: aborting due to previous error(s)
[00:45:34] 
[00:45:34] make[1]: *** [all] Error 101
[00:45:34] 
[00:45:34] ------------------------------------------
[00:45:34] 
[00:45:34] thread '[run-make] run-make/alloc-extern-crates' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2480
[00:45:34] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:45:34] 
[00:45:34] 
[00:45:34] failures:
[00:45:34]     [run-make] run-make/alloc-extern-crates

It really looks like the problem is that https://github.com/rust-lang/rust/blob/master/src/test/run-make/alloc-extern-crates/Makefile#L5 is missing a --crate-type=rlib:

-include ../tools.mk

all:
	$(RUSTC) fakealloc.rs
	$(RUSTC) ../../../liballoc/lib.rs --cfg feature=\"external_crate\" --extern external=$(TMPDIR)/$(shell $(RUSTC) --print file-names fakealloc.rs)
        # ^ should be `--crate-type=rlib`

arielb1 · 2017-06-13T20:45:22Z

After you fix the test, you can check it locally by running ./x.py test src/test/run-make

bors · 2017-06-15T15:06:55Z

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

arielb1 · 2017-06-20T20:02:22Z

🕸 Closing PR to keep the queue clean 🕸. This looks like a simple fix - feel free to reopen with it.

rust-highfive assigned brson May 2, 2017

aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2017

Mark-Simulacrum previously requested changes May 7, 2017

View reviewed changes

carols10cents 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-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2017

Remove crate_type and crate_name attributes from compiler crates

8aaa4ce

See issue #41701.

arielb1 closed this Jun 20, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove crate_type and crate_name attributes from compiler crates #41706

Remove crate_type and crate_name attributes from compiler crates #41706

daniellockyer commented May 2, 2017 •

edited by Mark-Simulacrum

Loading

rust-highfive commented May 2, 2017

aidanhs commented May 3, 2017

Mark-Simulacrum commented May 7, 2017

brson commented May 7, 2017

bors commented May 7, 2017

brson commented May 7, 2017

bors commented May 7, 2017

bors commented May 7, 2017

Mark-Simulacrum May 7, 2017

Mark-Simulacrum May 7, 2017

Mark-Simulacrum commented May 7, 2017

daniellockyer commented May 8, 2017

Mark-Simulacrum commented May 8, 2017

carols10cents commented May 8, 2017

bors commented May 13, 2017

arielb1 commented May 16, 2017

bors commented May 21, 2017

arielb1 commented May 23, 2017 •

edited

Loading

arielb1 commented May 23, 2017

daniellockyer commented May 24, 2017

aidanhs commented Jun 1, 2017

Mark-Simulacrum commented Jun 11, 2017

arielb1 commented Jun 13, 2017 •

edited

Loading

arielb1 commented Jun 13, 2017 •

edited

Loading

bors commented Jun 15, 2017

arielb1 commented Jun 20, 2017

Remove crate_type and crate_name attributes from compiler crates #41706

Remove crate_type and crate_name attributes from compiler crates #41706

Conversation

daniellockyer commented May 2, 2017 • edited by Mark-Simulacrum Loading

rust-highfive commented May 2, 2017

aidanhs commented May 3, 2017

Mark-Simulacrum commented May 7, 2017

brson commented May 7, 2017

bors commented May 7, 2017

brson commented May 7, 2017

bors commented May 7, 2017

bors commented May 7, 2017

Mark-Simulacrum May 7, 2017

Choose a reason for hiding this comment

Mark-Simulacrum May 7, 2017

Choose a reason for hiding this comment

Mark-Simulacrum commented May 7, 2017

daniellockyer commented May 8, 2017

Mark-Simulacrum commented May 8, 2017

carols10cents commented May 8, 2017

bors commented May 13, 2017

arielb1 commented May 16, 2017

bors commented May 21, 2017

arielb1 commented May 23, 2017 • edited Loading

arielb1 commented May 23, 2017

daniellockyer commented May 24, 2017

aidanhs commented Jun 1, 2017

Mark-Simulacrum commented Jun 11, 2017

arielb1 commented Jun 13, 2017 • edited Loading

arielb1 commented Jun 13, 2017 • edited Loading

bors commented Jun 15, 2017

arielb1 commented Jun 20, 2017

daniellockyer commented May 2, 2017 •

edited by Mark-Simulacrum

Loading

arielb1 commented May 23, 2017 •

edited

Loading

arielb1 commented Jun 13, 2017 •

edited

Loading

arielb1 commented Jun 13, 2017 •

edited

Loading