Skip to content

Commit 2a44a1b

Browse files
committed
Fix various warnings, NOTEs, etc
1 parent d28f734 commit 2a44a1b

File tree

10 files changed

+11
-13
lines changed

10 files changed

+11
-13
lines changed

src/libcore/libc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ pub mod funcs {
13941394
use libc::types::common::posix88::{DIR, dirent_t};
13951395
use libc::types::os::arch::c95::{c_char, c_int, c_long};
13961396

1397-
// NOTE: On OS X opendir and readdir have two versions,
1397+
// NB: On OS X opendir and readdir have two versions,
13981398
// one for 32-bit kernelspace and one for 64.
13991399
// We should be linking to the 64-bit ones, called
14001400
// opendir$INODE64, etc. but for some reason rustc

src/librustc/driver/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ pub fn compile_rest(sess: Session, cfg: ast::crate_cfg,
308308

309309
};
310310

311-
// NOTE: Android hack
311+
// NB: Android hack
312312
if sess.targ_cfg.arch == abi::Arm &&
313313
(sess.opts.output_type == link::output_type_object ||
314314
sess.opts.output_type == link::output_type_exe) {

src/librustc/middle/moves.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ use core::prelude::*;
211211
use middle::pat_util::{pat_bindings};
212212
use middle::freevars;
213213
use middle::ty;
214-
use middle::typeck::{method_map, method_map_entry};
214+
use middle::typeck::{method_map};
215215
use util::ppaux;
216216
use util::common::indenter;
217217

src/librustc/middle/trans/expr.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,6 @@ fn trans_assign_op(bcx: block,
17141714
return result_datum.copy_to_datum(bcx, DROP_EXISTING, dst_datum);
17151715
}
17161716

1717-
// NOTE: Mode neccessary here?
17181717
fn shorten(+x: ~str) -> ~str {
17191718
if x.len() > 60 { x.substr(0, 60).to_owned() } else { x }
17201719
}

src/librustc/middle/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4367,7 +4367,7 @@ pub fn iter_bound_traits_and_supertraits(tcx: ctxt,
43674367
for supertrait_refs.each |&supertrait_ref| {
43684368
let d_id = supertrait_ref.def_id;
43694369
if !supertrait_set.contains_key(&d_id) {
4370-
// NOTE Could have same trait multiple times
4370+
// FIXME(#5527) Could have same trait multiple times
43714371
supertrait_set.insert(d_id, ());
43724372
trait_ref = supertrait_ref;
43734373
seen_def_ids.push(d_id);

src/librustc/middle/typeck/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use middle::typeck::infer::combine::Combine;
3838
use middle::typeck::infer::InferCtxt;
3939
use middle::typeck::infer::{new_infer_ctxt, resolve_ivar};
4040
use middle::typeck::infer::{resolve_nested_tvar, resolve_type};
41-
use syntax::ast::{crate, def_id, def_mod, def_ty, def_trait};
41+
use syntax::ast::{crate, def_id, def_mod, def_trait};
4242
use syntax::ast::{item, item_impl, item_mod, local_crate, method, trait_ref};
4343
use syntax::ast;
4444
use syntax::ast_map::node_item;

src/librustc/middle/typeck/collect.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ are represented as `ty_param()` instances.
3333
use core::prelude::*;
3434

3535
use metadata::csearch;
36-
use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty};
36+
use middle::ty::{substs, ty_param_bounds_and_ty};
3737
use middle::ty;
3838
use middle::typeck::astconv::{AstConv, ty_of_arg};
3939
use middle::typeck::astconv::{ast_ty_to_ty};
4040
use middle::typeck::astconv;
4141
use middle::typeck::infer;
4242
use middle::typeck::rscope::*;
4343
use middle::typeck::rscope;
44-
use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx,
45-
write_tpt_to_tcx};
44+
use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx};
4645
use util::common::{indenter, pluralize};
4746
use util::ppaux;
4847

@@ -362,7 +361,7 @@ pub fn ensure_supertraits(ccx: &CrateCtxt,
362361
for ast_trait_refs.each |&ast_trait_ref| {
363362
let trait_ref = instantiate_trait_ref(ccx, ast_trait_ref, rp, generics);
364363

365-
// NOTE Could have same trait multiple times
364+
// FIXME(#5527) Could have same trait multiple times
366365
if ty_trait_refs.any(|other_trait| other_trait.def_id == trait_ref.def_id) {
367366
// This means a trait inherited from the same supertrait more
368367
// than once.

src/librustdoc/prune_private_pass.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn fold_mod(
117117
!doc.methods.is_empty()
118118
} else {
119119
// This is a trait implementation, make it visible
120-
// NOTE: This is not quite right since this could be an impl
120+
// NB: This is not quite right since this could be an impl
121121
// of a private trait. We can't know that without running
122122
// resolve though.
123123
true

src/libsyntax/ext/auto_encode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ pub fn expand_auto_decode(
222222
priv impl @ext_ctxt {
223223
fn bind_path(
224224
&self,
225-
span: span,
225+
_span: span,
226226
ident: ast::ident,
227227
path: @ast::path,
228228
bounds: @OptVec<ast::TyParamBound>

src/rt/rust_log.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void update_log_settings(void* crate_map, char* settings) {
314314
n_dirs, &n_matches);
315315

316316
if (n_matches < n_dirs) {
317-
// NOTE: Android compiler is complaining about format specifiers here
317+
// NB: Android compiler is complaining about format specifiers here
318318
// and I don't understand why
319319
/*printf("warning: got %" PRIdPTR " RUST_LOG specs, "
320320
"enabled %" PRIdPTR " flags.",

0 commit comments

Comments
 (0)