Skip to content

Commit 9e93760

Browse files
committed
---
yaml --- r: 66235 b: refs/heads/master c: 6ad31ff h: refs/heads/master i: 66233: 46e2842 66231: 1775615 v: v3
1 parent d05658b commit 9e93760

File tree

8 files changed

+5
-11
lines changed

8 files changed

+5
-11
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: caa50ce15d8ed8f0d50c9049053a5e2cd5a0d701
2+
refs/heads/master: 6ad31ffb53f9620f9063cb441de9c7338dfbb4de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/metadata/decoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use extra::ebml;
3535
use extra::serialize::Decodable;
3636
use syntax::ast_map;
3737
use syntax::attr;
38-
use syntax::diagnostic::span_handler;
3938
use syntax::parse::token::{ident_interner, special_idents};
4039
use syntax::print::pprust;
4140
use syntax::{ast, ast_util};

trunk/src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use middle::ty;
2121
use middle::subst::Subst;
2222
use middle::typeck;
2323
use middle;
24-
use util::ppaux::{note_and_explain_region, bound_region_to_str, bound_region_ptr_to_str};
24+
use util::ppaux::{note_and_explain_region, bound_region_ptr_to_str};
2525
use util::ppaux::{trait_store_to_str, ty_to_str, vstore_to_str};
2626
use util::ppaux::{Repr, UserString};
2727
use util::common::{indenter};

trunk/src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ use middle::typeck::{isr_alist, lookup_def_ccx};
107107
use middle::typeck::no_params;
108108
use middle::typeck::{require_same_types, method_map, vtable_map};
109109
use util::common::{block_query, indenter, loop_query};
110-
use util::ppaux::{bound_region_to_str,bound_region_ptr_to_str};
110+
use util::ppaux::{bound_region_ptr_to_str};
111111
use util::ppaux;
112112

113113

trunk/src/librustc/middle/typeck/coherence.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
use core::prelude::*;
1818

19-
use driver;
2019
use metadata::csearch::{each_path, get_impl_trait};
2120
use metadata::csearch::{get_impls_for_mod};
22-
use metadata::csearch;
2321
use metadata::cstore::{CStore, iter_crate_data};
2422
use metadata::decoder::{dl_def, dl_field, dl_impl};
2523
use middle::resolve::{Impl, MethodInfo};
@@ -39,7 +37,7 @@ use middle::typeck::infer::combine::Combine;
3937
use middle::typeck::infer::InferCtxt;
4038
use middle::typeck::infer::{new_infer_ctxt, resolve_ivar};
4139
use middle::typeck::infer::{resolve_nested_tvar, resolve_type};
42-
use syntax::ast::{crate, def_id, def_mod, def_struct, def_trait, def_ty};
40+
use syntax::ast::{crate, def_id, def_mod, def_struct, def_ty};
4341
use syntax::ast::{item, item_enum, item_impl, item_mod, item_struct};
4442
use syntax::ast::{local_crate, method, trait_ref, ty_path};
4543
use syntax::ast;

trunk/src/librustc/util/ppaux.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ use syntax::parse::token;
3232
use syntax::print::pprust;
3333
use syntax::{ast, ast_util};
3434

35-
use core::str;
3635
use core::vec;
3736

3837
/// Produces a string suitable for debugging output.

trunk/src/libstd/to_str.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ use str::OwnedStr;
1818
use hashmap::HashMap;
1919
use hashmap::HashSet;
2020
use iterator::IteratorUtil;
21-
use container::Map;
2221
use hash::Hash;
2322
use cmp::Eq;
2423
use vec::ImmutableVector;
25-
use iterator::IteratorUtil;
2624

2725
/// A generic trait for converting a value to a string
2826
pub trait ToStr {

trunk/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ use ast::{view_item_, view_item_extern_mod, view_item_use};
6060
use ast::{view_path, view_path_glob, view_path_list, view_path_simple};
6161
use ast::visibility;
6262
use ast;
63-
use ast_util::{as_prec, ident_to_path, operator_prec};
63+
use ast_util::{as_prec, operator_prec};
6464
use ast_util;
6565
use codemap::{span, BytePos, spanned, mk_sp};
6666
use codemap;

0 commit comments

Comments
 (0)