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

More refactoring to obey platform abstraction lint #36948

Merged
merged 10 commits into from
Nov 2, 2016
Merged

Conversation

brson
Copy link
Contributor

@brson brson commented Oct 4, 2016

The most interesting things here are moving std/sys/common to std/sys_common, and std/num/{f32,f64}.rs to std/{f32,f64}.rs, and adding more documentation to std/lib.rs.

r? @alexcrichton

rtabort!(concat!("assertion failed: ", stringify!($e)))
}
})
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This macro is no longer used anywhere.

Copy link
Member

Choose a reason for hiding this comment

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

🎺 ⚰ 🎺

@brson
Copy link
Contributor Author

brson commented Oct 4, 2016

A lot of this is just general cleanup...

@alexcrichton
Copy link
Member

src/libstd/num/f64.rs → src/libstd/f64.rs

How dare you!


// Turn warnings into errors, but only after stage0, where it can be useful for
// code to emit warnings during language transitions
#![cfg_attr(not(stage0), deny(warnings))]
Copy link
Member

Choose a reason for hiding this comment

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

If you're really ambitious, I've been meaning to remove all the cfg_attr here and just leave deny(warnings)

@@ -425,46 +403,62 @@ pub use core::u16;
pub use core::u32;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::u64;
#[stable(feature = "rust1", since = "1.0.0")]
pub use alloc::boxed;
Copy link
Member

Choose a reason for hiding this comment

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

I think the ordering here affects the ordering in rustdoc, right? (just confirming you want to change that too)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does not appear so to me. rustdoc seems to be alphabetizing everything.

@@ -184,6 +184,10 @@ macro_rules! assert_approx_eq {
})
}

macro_rules! rtabort {
Copy link
Member

Choose a reason for hiding this comment

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

aww I was hoping we could keep this contained within the sys module

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll see if I can put it there. I don't recall why I moved it, presumably just because it didn't work with my prefered module declaration order in lib.rs.

#[doc(hidden)]
#[cfg(not(target_thread_local))]
Copy link
Member

Choose a reason for hiding this comment

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

I think we'll want to always compile in this module. The theory behind this is that we compile the standard library with OS-based TLS (e.g. this module) but then consumers of the standard library can use the "fast TLS". The primary motivation here is OSX 10.6 and 10.7+, where 10.6 has slow TLS only but 10.7 has fast. We could in theory compile a 10.6 standard library but everyone else would have fast TLS.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK.

@alexcrichton
Copy link
Member

moving std/sys/common to std/sys_common

I kinda liked having everything contained in one nice "sys" directory, but I guess not enough to go against conventions of filesystem hierarchies and module structures.

@brson
Copy link
Contributor Author

brson commented Oct 4, 2016

Updated to leave os-specific TLS key in with documentation for why, move rtabort back to sys_common.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 4, 2016

📌 Commit ae10558 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Oct 6, 2016

⌛ Testing commit ae10558 with merge d3b75bb...

@bors
Copy link
Contributor

bors commented Oct 6, 2016

💥 Test timed out

@alexcrichton
Copy link
Member

@bors: retry

  • ??

@bors
Copy link
Contributor

bors commented Oct 6, 2016

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

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Oct 13, 2016

🔒 Merge conflict

@alexcrichton
Copy link
Member

ping @brson (for an update)

This makes it dissimilar to how core is structured on disk, but
more predictable on its own.
@brson
Copy link
Contributor Author

brson commented Nov 1, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Nov 1, 2016

📌 Commit 6135cbc has been approved by brson

@bors
Copy link
Contributor

bors commented Nov 2, 2016

⌛ Testing commit 6135cbc with merge fc67cad...

bors added a commit that referenced this pull request Nov 2, 2016
More refactoring to obey platform abstraction lint

The most interesting things here are moving `std/sys/common` to `std/sys_common`, and `std/num/{f32,f64}.rs` to `std/{f32,f64}.rs`, and adding more documentation to `std/lib.rs`.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Nov 2, 2016

💔 Test failed - auto-win-gnu-64-opt

@alexcrichton
Copy link
Member

@bors: retry

On Wednesday, November 2, 2016, bors notifications@github.com wrote:

💔 Test failed - auto-win-gnu-64-opt
https://buildbot.rust-lang.org/builders/auto-win-gnu-64-opt/builds/6005


You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
#36948 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95PUMAp0IYQNuNyPDU8pI9h-DwlSBks5q6IQPgaJpZM4KNL4c
.

@bors
Copy link
Contributor

bors commented Nov 2, 2016

⌛ Testing commit 6135cbc with merge 0ca9967...

bors added a commit that referenced this pull request Nov 2, 2016
More refactoring to obey platform abstraction lint

The most interesting things here are moving `std/sys/common` to `std/sys_common`, and `std/num/{f32,f64}.rs` to `std/{f32,f64}.rs`, and adding more documentation to `std/lib.rs`.

r? @alexcrichton
@bors bors merged commit 6135cbc into rust-lang:master Nov 2, 2016
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.

5 participants