user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge rust-lang/libm#92

Browse source 
92: Use separate imports instead of {}-grouped imports for better merges r=japaric a=porglezomp

Previously every merge would cause conflicts because the {}-group would re-flow, which the merge algorithm can't handle. This will hopefully make rebases and merges go more smoothly while everyone is still adding new modules.

Co-authored-by: C Jones <code@calebjones.net>
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
This commit is contained in:
bors[bot] 2018-07-14 16:00:03 +00:00
commit 34ae08d2a2
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
library/compiler-builtins/libm/src/math/mod.rs
View file

@ -34,13 +34,34 @@ mod sqrtf;
mod trunc;
mod truncf;
pub use self::{
ceilf::ceilf, cosf::cosf, expf::expf, fabs::fabs, fabsf::fabsf, floor::floor, floorf::floorf,
fmodf::fmodf, hypot::hypot, hypotf::hypotf, log::log, log10::log10, log10f::log10f,
log1p::log1p, log1pf::log1pf, log2::log2, log2f::log2f, logf::logf, powf::powf, round::round,
roundf::roundf, scalbn::scalbn, scalbnf::scalbnf, sqrt::sqrt, sqrtf::sqrtf, trunc::trunc,
truncf::truncf,
};
// Use separated imports instead of {}-grouped imports for easier merging.
pub use self::ceilf::ceilf;
pub use self::cosf::cosf;
pub use self::expf::expf;
pub use self::fabs::fabs;
pub use self::fabsf::fabsf;
pub use self::floor::floor;
pub use self::floorf::floorf;
pub use self::fmodf::fmodf;
pub use self::hypot::hypot;
pub use self::hypotf::hypotf;
pub use self::log::log;
pub use self::log10::log10;
pub use self::log10f::log10f;
pub use self::log1p::log1p;
pub use self::log1pf::log1pf;
pub use self::log2::log2;
pub use self::log2f::log2f;
pub use self::logf::logf;
pub use self::powf::powf;
pub use self::round::round;
pub use self::roundf::roundf;
pub use self::scalbn::scalbn;
pub use self::scalbnf::scalbnf;
pub use self::sqrt::sqrt;
pub use self::sqrtf::sqrtf;
pub use self::trunc::trunc;
pub use self::truncf::truncf;
mod k_cosf;
mod k_sinf;