Skip to content

removed math leftovers from std #1350

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 1 commit into from
Dec 20, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/comp/back/rpath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import std::fs;
import std::os_fs;
import vec;
import std::map;
import std::math;
import str;
import uint;
import metadata::cstore;
Expand Down Expand Up @@ -129,7 +128,7 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path {
assert len1 > 0u;
assert len2 > 0u;

let max_common_path = math::min(len1, len2) - 1u;
let max_common_path = float::min(len1, len2) - 1u;
let start_idx = 0u;
while start_idx < max_common_path
&& split1[start_idx] == split2[start_idx] {
Expand Down
3 changes: 1 addition & 2 deletions src/comp/middle/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import uint;
import std::ufind;
import std::map;
import std::map::hashmap;
import std::math;
import option;
import option::none;
import option::some;
Expand Down Expand Up @@ -1754,7 +1753,7 @@ mod unify {
// Unifies two sets.
fn union(cx: @ctxt, set_a: uint, set_b: uint,
variance: variance) -> union_result {
ufind::grow(cx.vb.sets, math::max(set_a, set_b) + 1u);
ufind::grow(cx.vb.sets, float::max(set_a, set_b) + 1u);
let root_a = ufind::find(cx.vb.sets, set_a);
let root_b = ufind::find(cx.vb.sets, set_b);

Expand Down
2 changes: 1 addition & 1 deletion src/comp/util/common.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import core::{str, option};
import std::math::{max, min};
import core::float::{max, min};
import std::map::hashmap;
import option::{some};
import syntax::ast;
Expand Down
6 changes: 3 additions & 3 deletions src/fuzzer/fuzzer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import core::{vec, str, int, uint, option, result};
import std::{fs, io, math};
import std::{fs, io};

import rustc::syntax::{ast, ast_util, fold, visit, codemap};
import rustc::syntax::parse::parser;
Expand Down Expand Up @@ -241,9 +241,9 @@ fn check_variants_T<copy T>(
let L = vec::len(things);

if L < 100u {
under(math::min(L, 20u)) {|i|
under(float::min(L, 20u)) {|i|
log_err "Replacing... #" + uint::str(i);
under(math::min(L, 30u)) {|j|
under(float::min(L, 30u)) {|j|
log_err "With... " + stringifier(@things[j]);
let crate2 = @replacer(crate, i, things[j], cx.mode);
// It would be best to test the *crate* for stability, but testing the
Expand Down
71 changes: 0 additions & 71 deletions src/libstd/cmath.rs

This file was deleted.

146 changes: 0 additions & 146 deletions src/libstd/ctypes.rs

This file was deleted.

Loading