Skip to content

Attempt to fix tests on master #662

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

Merged
merged 2 commits into from
Jan 30, 2019
Merged

Conversation

alexcrichton
Copy link
Member

  • Make all doctests use items from the real std rather than this
    crate, it's just easier
  • Handle debuginfo weirdness by flagging functions as no_mangle that
    we're looking for instructions within.

* Make all doctests use items from the real `std` rather than this
  crate, it's just easier
* Handle debuginfo weirdness by flagging functions as `no_mangle` that
  we're looking for instructions within.
@alexcrichton
Copy link
Member Author

FWIW I believe a number of these changes are motivated by the recent LLVM upgrade in rust-lang/rust, others are just minor things to accrue over time I believe

@alexcrichton alexcrichton merged commit 5afe9bc into rust-lang:master Jan 30, 2019
@alexcrichton alexcrichton deleted the fix-tests branch January 30, 2019 23:11
# extern crate core_arch as std;
# #[cfg(not(dox))]
# #[macro_use(is_x86_feature_detected)]
# extern crate std_detect;
Copy link
Contributor

@gnzlbg gnzlbg Jan 31, 2019

Choose a reason for hiding this comment

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

Should we be doing this everywhere ? There are many doc examples where we do this dance. EDIT: I see some more of this below, sorry about the noise!

EDIT2: so grepping for "real_std" reveals still some occurrences of this. I am not sure exactly why this change was needed here but not everywhere else.

Opened: #665

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah I don't really know what was happening to have the doctests fail, but this is all in std now so none of this was necessary any more

@@ -99,6 +99,7 @@ pub fn assert_instr(
let shim_name_str = format!("{}{}", shim_name, assert_name);
let to_test = quote! {
#attrs
#[no_mangle]
Copy link
Contributor

@gnzlbg gnzlbg Jan 31, 2019

Choose a reason for hiding this comment

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

We probably should add a comment around here about which exact problem #[no_mangle] solves (debug-info weirdness).

EDIT: opened #664

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants