Skip to content

Commit e9c20bb

Browse files
committed
---
yaml --- r: 102041 b: refs/heads/master c: 03b7910 h: refs/heads/master i: 102039: 0c425ec v: v3
1 parent 84c3802 commit e9c20bb

File tree

18 files changed

+643
-449
lines changed

18 files changed

+643
-449
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b5995b4e93237fe0d1c0ea76e33eb2429f654487
2+
refs/heads/master: 03b791095d6f6a0b4900ca9ad2e17fb4eb590fb7
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
55
refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator Cloneabl
8585
syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize
8686

8787
syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
88-
syn keyword rustTrait Bitwise Bounded Fractional
88+
syn keyword rustTrait Bitwise Bounded Integer
8989
syn keyword rustTrait Num NumCast CheckedAdd CheckedSub CheckedMul CheckedDiv
9090
syn keyword rustTrait Orderable Signed Unsigned Round
9191
syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive

trunk/src/libnum/bigint.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ A `BigUint` is represented as an array of `BigDigit`s.
1616
A `BigInt` is a combination of `BigUint` and `Sign`.
1717
*/
1818

19-
use Integer;
20-
2119
use std::cmp;
2220
use std::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
2321
use std::num::{Zero, One, ToStrRadix, FromStrRadix};
@@ -463,7 +461,7 @@ impl Integer for BigUint {
463461

464462
/// Returns `true` if the number can be divided by `other` without leaving a remainder
465463
#[inline]
466-
fn divides(&self, other: &BigUint) -> bool { (*self % *other).is_zero() }
464+
fn is_multiple_of(&self, other: &BigUint) -> bool { (*self % *other).is_zero() }
467465

468466
/// Returns `true` if the number is divisible by `2`
469467
#[inline]
@@ -1120,7 +1118,7 @@ impl Integer for BigInt {
11201118

11211119
/// Returns `true` if the number can be divided by `other` without leaving a remainder
11221120
#[inline]
1123-
fn divides(&self, other: &BigInt) -> bool { self.data.divides(&other.data) }
1121+
fn is_multiple_of(&self, other: &BigInt) -> bool { self.data.is_multiple_of(&other.data) }
11241122

11251123
/// Returns `true` if the number is divisible by `2`
11261124
#[inline]
@@ -1390,7 +1388,6 @@ impl BigInt {
13901388
13911389
#[cfg(test)]
13921390
mod biguint_tests {
1393-
use Integer;
13941391
use super::{BigDigit, BigUint, ToBigUint};
13951392
use super::{Plus, BigInt, RandBigInt, ToBigInt};
13961393
@@ -2048,7 +2045,6 @@ mod biguint_tests {
20482045

20492046
#[cfg(test)]
20502047
mod bigint_tests {
2051-
use Integer;
20522048
use super::{BigDigit, BigUint, ToBigUint};
20532049
use super::{Sign, Minus, Zero, Plus, BigInt, RandBigInt, ToBigInt};
20542050

0 commit comments

Comments
 (0)