diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/libc.rs | 2 | ||||
| -rw-r--r-- | src/librustc/driver/driver.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/moves.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/trans/expr.rs | 1 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/typeck/coherence.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/typeck/collect.rs | 7 | ||||
| -rw-r--r-- | src/librustdoc/prune_private_pass.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/auto_encode.rs | 2 | ||||
| -rw-r--r-- | src/rt/rust_log.cpp | 2 |
10 files changed, 11 insertions, 13 deletions
diff --git a/src/libcore/libc.rs b/src/libcore/libc.rs index fdb82a7303b..95d963a36e3 100644 --- a/src/libcore/libc.rs +++ b/src/libcore/libc.rs @@ -1394,7 +1394,7 @@ pub mod funcs { use libc::types::common::posix88::{DIR, dirent_t}; use libc::types::os::arch::c95::{c_char, c_int, c_long}; - // NOTE: On OS X opendir and readdir have two versions, + // NB: On OS X opendir and readdir have two versions, // one for 32-bit kernelspace and one for 64. // We should be linking to the 64-bit ones, called // opendir$INODE64, etc. but for some reason rustc diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 3b1401ae1d2..cd1af369570 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -308,7 +308,7 @@ pub fn compile_rest(sess: Session, cfg: ast::crate_cfg, }; - // NOTE: Android hack + // NB: Android hack if sess.targ_cfg.arch == abi::Arm && (sess.opts.output_type == link::output_type_object || sess.opts.output_type == link::output_type_exe) { diff --git a/src/librustc/middle/moves.rs b/src/librustc/middle/moves.rs index ed7ca441b98..1401d86123e 100644 --- a/src/librustc/middle/moves.rs +++ b/src/librustc/middle/moves.rs @@ -211,7 +211,7 @@ use core::prelude::*; use middle::pat_util::{pat_bindings}; use middle::freevars; use middle::ty; -use middle::typeck::{method_map, method_map_entry}; +use middle::typeck::{method_map}; use util::ppaux; use util::common::indenter; diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 5afdd1b0271..d4a1013e83c 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -1714,7 +1714,6 @@ fn trans_assign_op(bcx: block, return result_datum.copy_to_datum(bcx, DROP_EXISTING, dst_datum); } -// NOTE: Mode neccessary here? fn shorten(+x: ~str) -> ~str { if x.len() > 60 { x.substr(0, 60).to_owned() } else { x } } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index b1d977b7445..b20678ac092 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -4367,7 +4367,7 @@ pub fn iter_bound_traits_and_supertraits(tcx: ctxt, for supertrait_refs.each |&supertrait_ref| { let d_id = supertrait_ref.def_id; if !supertrait_set.contains_key(&d_id) { - // NOTE Could have same trait multiple times + // FIXME(#5527) Could have same trait multiple times supertrait_set.insert(d_id, ()); trait_ref = supertrait_ref; seen_def_ids.push(d_id); diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs index f6042cf2e0c..b0e5ecee01e 100644 --- a/src/librustc/middle/typeck/coherence.rs +++ b/src/librustc/middle/typeck/coherence.rs @@ -38,7 +38,7 @@ use middle::typeck::infer::combine::Combine; use middle::typeck::infer::InferCtxt; use middle::typeck::infer::{new_infer_ctxt, resolve_ivar}; use middle::typeck::infer::{resolve_nested_tvar, resolve_type}; -use syntax::ast::{crate, def_id, def_mod, def_ty, def_trait}; +use syntax::ast::{crate, def_id, def_mod, def_trait}; use syntax::ast::{item, item_impl, item_mod, local_crate, method, trait_ref}; use syntax::ast; use syntax::ast_map::node_item; diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index a2245dc82cf..8dda513106e 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -33,7 +33,7 @@ are represented as `ty_param()` instances. use core::prelude::*; use metadata::csearch; -use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty}; +use middle::ty::{substs, ty_param_bounds_and_ty}; use middle::ty; use middle::typeck::astconv::{AstConv, ty_of_arg}; use middle::typeck::astconv::{ast_ty_to_ty}; @@ -41,8 +41,7 @@ use middle::typeck::astconv; use middle::typeck::infer; use middle::typeck::rscope::*; use middle::typeck::rscope; -use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx, - write_tpt_to_tcx}; +use middle::typeck::{CrateCtxt, lookup_def_tcx, no_params, write_ty_to_tcx}; use util::common::{indenter, pluralize}; use util::ppaux; @@ -362,7 +361,7 @@ pub fn ensure_supertraits(ccx: &CrateCtxt, for ast_trait_refs.each |&ast_trait_ref| { let trait_ref = instantiate_trait_ref(ccx, ast_trait_ref, rp, generics); - // NOTE Could have same trait multiple times + // FIXME(#5527) Could have same trait multiple times if ty_trait_refs.any(|other_trait| other_trait.def_id == trait_ref.def_id) { // This means a trait inherited from the same supertrait more // than once. diff --git a/src/librustdoc/prune_private_pass.rs b/src/librustdoc/prune_private_pass.rs index a1f8fdb75d9..08008ab2bca 100644 --- a/src/librustdoc/prune_private_pass.rs +++ b/src/librustdoc/prune_private_pass.rs @@ -117,7 +117,7 @@ fn fold_mod( !doc.methods.is_empty() } else { // This is a trait implementation, make it visible - // NOTE: This is not quite right since this could be an impl + // NB: This is not quite right since this could be an impl // of a private trait. We can't know that without running // resolve though. true diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs index 39b8d4f2cce..97bc89248ac 100644 --- a/src/libsyntax/ext/auto_encode.rs +++ b/src/libsyntax/ext/auto_encode.rs @@ -222,7 +222,7 @@ pub fn expand_auto_decode( priv impl @ext_ctxt { fn bind_path( &self, - span: span, + _span: span, ident: ast::ident, path: @ast::path, bounds: @OptVec<ast::TyParamBound> diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp index 2b86db6defe..32723cf31bc 100644 --- a/src/rt/rust_log.cpp +++ b/src/rt/rust_log.cpp @@ -314,7 +314,7 @@ void update_log_settings(void* crate_map, char* settings) { n_dirs, &n_matches); if (n_matches < n_dirs) { - // NOTE: Android compiler is complaining about format specifiers here + // NB: Android compiler is complaining about format specifiers here // and I don't understand why /*printf("warning: got %" PRIdPTR " RUST_LOG specs, " "enabled %" PRIdPTR " flags.", |