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

rollup merge of #20607: nrc/kinds

Browse source 
Conflicts:
	src/libcore/array.rs
	src/libcore/cell.rs
	src/libcore/prelude.rs
	src/libstd/path/posix.rs
	src/libstd/prelude/v1.rs
	src/test/compile-fail/dst-sized-trait-param.rs
This commit is contained in:
Alex Crichton 2015-01-06 15:34:10 -08:00
commit 771fe9026a
156 changed files with 580 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/middle/expr_use_visitor.rs
View file

@ -29,7 +29,7 @@ use middle::ty::{MethodOrigin, MethodParam, MethodTypeParam};
use middle::ty::{MethodStatic, MethodStaticUnboxedClosure};
use util::ppaux::Repr;
use std::kinds;
use std::marker;
use syntax::{ast, ast_util};
use syntax::ptr::P;
use syntax::codemap::Span;
@ -135,7 +135,7 @@ enum TrackMatchMode<T> {
Conflicting,
}
impl<T> kinds::Copy for TrackMatchMode<T> {}
impl<T> marker::Copy for TrackMatchMode<T> {}
impl<T> TrackMatchMode<T> {
// Builds up the whole match mode for a pattern from its constituent

2
src/librustc/middle/infer/unify.rs
View file

@ -10,7 +10,7 @@
pub use self::VarValue::*;
use std::kinds::marker;
use std::marker;
use middle::ty::{expected_found, IntVarValue};
use middle::ty::{self, Ty};