Skip to content

Remove issue number restriction on FIXME and change XXXs to FIXMEs #11817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
@@ -636,7 +636,7 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
CFG_INFO := $(info cfg:)

#XXX This is surely busted
#FIXME This is surely busted
all: $(SREQ1$(CFG_BUILD)) $(GENERATED) docs

else
2 changes: 1 addition & 1 deletion doc/tutorial.md
Original file line number Diff line number Diff line change
@@ -2895,7 +2895,7 @@ and only if that results in no match look at items you brought in
scope with corresponding `use` statements.

~~~ {.ignore}
# // XXX: Allow unused import in doc test
# // FIXME: Allow unused import in doc test
use farm::cow;
// ...
# mod farm { pub fn cow() { println!("Hidden ninja cow is hidden.") } }
2 changes: 1 addition & 1 deletion mk/platform.mk
Original file line number Diff line number Diff line change
@@ -596,7 +596,7 @@ define CFG_MAKE_TOOLCHAIN
else

# For the ARM and MIPS crosses, use the toolchain assembler
# XXX: We should be able to use the LLVM assembler
# FIXME: We should be able to use the LLVM assembler
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)

5 changes: 2 additions & 3 deletions src/etc/tidy.py
Original file line number Diff line number Diff line change
@@ -45,9 +45,8 @@ def do_license_check(name, contents):
openhook=fileinput.hook_encoded("utf-8")):

if fileinput.filename().find("tidy.py") == -1:
if line.find("FIXME") != -1:
if re.search("FIXME.*#\d+", line) == None:
report_err("FIXME without issue number")
if line.find("// XXX") != -1:
report_err("XXX is no longer necessary, use FIXME")
if line.find("TODO") != -1:
report_err("TODO is deprecated; use FIXME")
match = re.match(r'^.*//\s*(NOTE.*)$', line)
2 changes: 1 addition & 1 deletion src/libextra/arena.rs
Original file line number Diff line number Diff line change
@@ -276,7 +276,7 @@ impl Arena {
#[inline]
pub fn alloc<'a, T>(&'a self, op: || -> T) -> &'a T {
unsafe {
// XXX: Borrow check
// FIXME: Borrow check
let this = transmute_mut(self);
if intrinsics::needs_drop::<T>() {
this.alloc_nonpod(op)
2 changes: 1 addition & 1 deletion src/libextra/ebml.rs
Original file line number Diff line number Diff line change
@@ -630,7 +630,7 @@ pub mod writer {

// FIXME (#2741): Provide a function to write the standard ebml header.
impl<'a> Encoder<'a> {
/// XXX(pcwalton): Workaround for badness in trans. DO NOT USE ME.
/// FIXME(pcwalton): Workaround for badness in trans. DO NOT USE ME.
pub unsafe fn unsafe_clone(&self) -> Encoder<'a> {
Encoder {
writer: cast::transmute_copy(&self.writer),
2 changes: 1 addition & 1 deletion src/libextra/glob.rs
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Paths {
let pat_root = Path::new(pattern).root_path();
if pat_root.is_some() {
if check_windows_verbatim(pat_root.get_ref()) {
// XXX: How do we want to handle verbatim paths? I'm inclined to return nothing,
// FIXME: How do we want to handle verbatim paths? I'm inclined to return nothing,
// since we can't very well find all UNC shares with a 1-letter server name.
return Paths { root: root, dir_patterns: ~[], options: options, todo: ~[] };
}
4 changes: 2 additions & 2 deletions src/libextra/url.rs
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@ fn decode_inner(s: &str, full_url: bool) -> ~str {
let mut bytes = [0, 0];
match rdr.read(bytes) {
Some(2) => {}
_ => fail!() // XXX: malformed url?
_ => fail!() // FIXME: malformed url?
}
let ch = uint::parse_bytes(bytes, 16u).unwrap() as u8 as char;

@@ -308,7 +308,7 @@ pub fn decode_form_urlencoded(s: &[u8]) -> HashMap<~str, ~[~str]> {
let mut bytes = [0, 0];
match rdr.read(bytes) {
Some(2) => {}
_ => fail!() // XXX: malformed?
_ => fail!() // FIXME: malformed?
}
uint::parse_bytes(bytes, 16u).unwrap() as u8 as char
}
2 changes: 1 addition & 1 deletion src/libextra/workcache.rs
Original file line number Diff line number Diff line change
@@ -413,7 +413,7 @@ impl<'a> Prep<'a> {
let (port, chan) = Chan::new();
let blk = bo.take_unwrap();

// XXX: What happens if the task fails?
// FIXME: What happens if the task fails?
do spawn {
let mut exe = Exec {
discovered_inputs: WorkMap::new(),
2 changes: 1 addition & 1 deletion src/libgreen/basic.rs
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ impl EventLoop for BasicLoop {
self.work.push(f);
}

// XXX: Seems like a really weird requirement to have an event loop provide.
// FIXME: Seems like a really weird requirement to have an event loop provide.
fn pausable_idle_callback(&mut self, cb: ~Callback) -> ~PausableIdleCallback {
let callback = ~BasicPausable::new(self, cb);
rtassert!(self.idle.is_none());
4 changes: 2 additions & 2 deletions src/libgreen/macros.rs
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// XXX: this file probably shouldn't exist
// FIXME: this file probably shouldn't exist

#[macro_escape];

use std::fmt;

// Indicates whether we should perform expensive sanity checks, including rtassert!
// XXX: Once the runtime matures remove the `true` below to turn off rtassert, etc.
// FIXME: Once the runtime matures remove the `true` below to turn off rtassert, etc.
pub static ENFORCE_SANITY: bool = true || !cfg!(rtopt) || cfg!(rtdebug) || cfg!(rtassert);

macro_rules! rterrln (
6 changes: 3 additions & 3 deletions src/libgreen/sched.rs
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ use task::{TypeSched, GreenTask, HomeSched, AnySched};
/// struct. The scheduler struct acts like a baton, all scheduling
/// actions are transfers of the baton.
///
/// XXX: This creates too many callbacks to run_sched_once, resulting
/// FIXME: This creates too many callbacks to run_sched_once, resulting
/// in too much allocation and too many events.
pub struct Scheduler {
/// ID number of the pool that this scheduler is a member of. When
@@ -171,7 +171,7 @@ impl Scheduler {
return sched;
}

// XXX: This may eventually need to be refactored so that
// FIXME: This may eventually need to be refactored so that
// the scheduler itself doesn't have to call event_loop.run.
// That will be important for embedding the runtime into external
// event loops.
@@ -898,7 +898,7 @@ impl CleanupJob {
}
}

// XXX: Some hacks to put a || closure in Scheduler without borrowck
// FIXME: Some hacks to put a || closure in Scheduler without borrowck
// complaining
type UnsafeTaskReceiver = raw::Closure;
trait ClosureConverter {
4 changes: 2 additions & 2 deletions src/libgreen/stack.rs
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ impl Stack {
valgrind_id: 0
};

// XXX: Using the FFI to call a C macro. Slow
// FIXME: Using the FFI to call a C macro. Slow
stk.valgrind_id = unsafe {
rust_valgrind_stack_register(stk.start(), stk.end())
};
@@ -117,7 +117,7 @@ fn protect_last_page(stack: &MemoryMap) -> bool {
impl Drop for Stack {
fn drop(&mut self) {
unsafe {
// XXX: Using the FFI to call a C macro. Slow
// FIXME: Using the FFI to call a C macro. Slow
rust_valgrind_stack_deregister(self.valgrind_id);
}
}
6 changes: 3 additions & 3 deletions src/libnative/io/file.rs
Original file line number Diff line number Diff line change
@@ -674,7 +674,7 @@ pub fn chown(p: &CString, uid: int, gid: int) -> IoResult<()> {
pub fn readlink(p: &CString) -> IoResult<Path> {
return os_readlink(p);

// XXX: I have a feeling that this reads intermediate symlinks as well.
// FIXME: I have a feeling that this reads intermediate symlinks as well.
#[cfg(windows)]
fn os_readlink(p: &CString) -> IoResult<Path> {
let handle = unsafe {
@@ -709,7 +709,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
let p = p.with_ref(|p| p);
let mut len = unsafe { libc::pathconf(p, libc::_PC_NAME_MAX) };
if len == -1 {
len = 1024; // XXX: read PATH_MAX from C ffi?
len = 1024; // FIXME: read PATH_MAX from C ffi?
}
let mut buf = vec::with_capacity::<u8>(len as uint);
match retry(|| unsafe {
@@ -877,7 +877,7 @@ pub fn stat(p: &CString) -> IoResult<io::FileStat> {
pub fn lstat(p: &CString) -> IoResult<io::FileStat> {
return os_lstat(p);

// XXX: windows implementation is missing
// FIXME: windows implementation is missing
#[cfg(windows)]
fn os_lstat(_p: &CString) -> IoResult<io::FileStat> {
Err(super::unimpl())
2 changes: 1 addition & 1 deletion src/libnative/io/mod.rs
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ fn translate_error(errno: i32, detail: bool) -> IoError {

#[cfg(not(windows))]
fn get_err(errno: i32) -> (io::IoErrorKind, &'static str) {
// XXX: this should probably be a bit more descriptive...
// FIXME: this should probably be a bit more descriptive...
match errno {
libc::EOF => (io::EndOfFile, "end of file"),
libc::ECONNREFUSED => (io::ConnectionRefused, "connection refused"),
2 changes: 1 addition & 1 deletion src/libnative/io/timer_timerfd.rs
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
let mut bits = [0, ..8];
// drain the timerfd of how many times its fired
//
// XXX: should this perform a send() this number of
// FIXME: should this perform a send() this number of
// times?
FileDesc::new(fd, false).inner_read(bits);
let remove = {
4 changes: 2 additions & 2 deletions src/librustc/lib.rs
Original file line number Diff line number Diff line change
@@ -330,7 +330,7 @@ fn parse_crate_attrs(sess: session::Session,
/// The diagnostic emitter yielded to the procedure should be used for reporting
/// errors of the compiler.
pub fn monitor(f: proc(@diagnostic::Emitter)) {
// XXX: This is a hack for newsched since it doesn't support split stacks.
// FIXME: This is a hack for newsched since it doesn't support split stacks.
// rustc needs a lot of stack! When optimizations are disabled, it needs
// even *more* stack than usual as well.
#[cfg(rtopt)]
@@ -341,7 +341,7 @@ pub fn monitor(f: proc(@diagnostic::Emitter)) {
let mut task_builder = task::task();
task_builder.name("rustc");

// XXX: Hacks on hacks. If the env is trying to override the stack size
// FIXME: Hacks on hacks. If the env is trying to override the stack size
// then *don't* set it explicitly.
if os::getenv("RUST_MIN_STACK").is_none() {
task_builder.opts.stack_size = Some(STACK_SIZE);
2 changes: 1 addition & 1 deletion src/librustc/metadata/encoder.rs
Original file line number Diff line number Diff line change
@@ -1275,7 +1275,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
// If this is a static method, we've already encoded
// this.
if method_ty.explicit_self != SelfStatic {
// XXX: I feel like there is something funny going on.
// FIXME: I feel like there is something funny going on.
let tpt = ty::lookup_item_type(tcx, method_def_id);
encode_bounds_and_type(ebml_w, ecx, &tpt);
}
4 changes: 2 additions & 2 deletions src/librustc/metadata/loader.rs
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@ impl Context {
for lib in libs.mut_iter() {
match lib.dylib {
Some(ref p) if p.filename_str() == Some(file.as_slice()) => {
assert!(lib.rlib.is_none()); // XXX: legit compiler error
assert!(lib.rlib.is_none()); // FIXME: legit compiler error
lib.rlib = Some(path.clone());
return true;
}
@@ -207,7 +207,7 @@ impl Context {
for lib in libs.mut_iter() {
match lib.rlib {
Some(ref p) if p.filename_str() == Some(file.as_slice()) => {
assert!(lib.dylib.is_none()); // XXX: legit compiler error
assert!(lib.dylib.is_none()); // FIXME: legit compiler error
lib.dylib = Some(path.clone());
return true;
}
2 changes: 1 addition & 1 deletion src/librustc/middle/astencode.rs
Original file line number Diff line number Diff line change
@@ -913,7 +913,7 @@ impl<'a,'b> ast_util::IdVisitingOperation for
// it is mutable. But I believe it's harmless since we generate
// balanced EBML.
//
// XXX(pcwalton): Don't copy this way.
// FIXME(pcwalton): Don't copy this way.
let mut new_ebml_w = unsafe {
self.new_ebml_w.unsafe_clone()
};
2 changes: 1 addition & 1 deletion src/librustc/middle/borrowck/gather_loans/mod.rs
Original file line number Diff line number Diff line change
@@ -416,7 +416,7 @@ impl<'a> GatherLoanCtxt<'a> {
}

ty::AutoObject(..) => {
// XXX: Handle @Trait to &Trait casts here?
// FIXME: Handle @Trait to &Trait casts here?
}
}
}
2 changes: 1 addition & 1 deletion src/librustc/middle/borrowck/mod.rs
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ pub mod move_data;

pub struct LoanDataFlowOperator;

/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for LoanDataFlowOperator {
fn clone(&self) -> LoanDataFlowOperator {
4 changes: 2 additions & 2 deletions src/librustc/middle/borrowck/move_data.rs
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ pub struct Assignment {

pub struct MoveDataFlowOperator;

/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for MoveDataFlowOperator {
fn clone(&self) -> MoveDataFlowOperator {
@@ -160,7 +160,7 @@ pub type MoveDataFlow = DataFlowContext<MoveDataFlowOperator>;

pub struct AssignDataFlowOperator;

/// XXX(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// FIXME(pcwalton): Should just be #[deriving(Clone)], but that doesn't work
/// yet on unit structs.
impl Clone for AssignDataFlowOperator {
fn clone(&self) -> AssignDataFlowOperator {
2 changes: 1 addition & 1 deletion src/librustc/middle/reachable.rs
Original file line number Diff line number Diff line change
@@ -404,7 +404,7 @@ impl ReachableContext {

// Step 3: Mark all destructors as reachable.
//
// XXX(pcwalton): This is a conservative overapproximation, but fixing
// FIXME(pcwalton): This is a conservative overapproximation, but fixing
// this properly would result in the necessity of computing *type*
// reachability, which might result in a compile time loss.
fn mark_destructors_reachable(&self) {
6 changes: 3 additions & 3 deletions src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ pub struct Export2 {
// not contain any entries from local crates.
pub type ExternalExports = HashSet<DefId>;

// XXX: dox
// FIXME: dox
pub type LastPrivateMap = HashMap<NodeId, LastPrivate>;

pub enum LastPrivate {
@@ -1411,7 +1411,7 @@ impl Resolver {
parent: ReducedGraphParent,
parent_public: bool) {
let ident = variant.node.name;
// XXX: this is unfortunate to have to do this privacy calculation
// FIXME: this is unfortunate to have to do this privacy calculation
// here. This should be living in middle::privacy, but it's
// necessary to keep around in some form becaues of glob imports...
let is_public = parent_public && variant.node.vis != ast::Private;
@@ -5282,7 +5282,7 @@ impl Resolver {
`{}`",
interner_get(label))),
Some(DlDef(def @ DefLabel(_))) => {
// XXX: is AllPublic correct?
// FIXME: is AllPublic correct?
self.record_def(expr.id, (def, AllPublic))
}
Some(_) => {
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/_match.rs
Original file line number Diff line number Diff line change
@@ -643,7 +643,7 @@ fn enter_opt<'r,'b>(
}
ast::PatEnum(_, ref subpats) => {
if opt_eq(tcx, &variant_opt(bcx, p.id), opt) {
// XXX: Must we clone?
// FIXME: Must we clone?
match *subpats {
None => Some(vec::from_elem(variant_size, dummy)),
_ => (*subpats).clone(),
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/adt.rs
Original file line number Diff line number Diff line change
@@ -805,7 +805,7 @@ fn padding(size: u64) -> ValueRef {
C_undef(Type::array(&Type::i8(), size))
}

// XXX this utility routine should be somewhere more general
// FIXME this utility routine should be somewhere more general
#[inline]
fn roundup(x: u64, a: u64) -> u64 { ((x + (a - 1)) / a) * a }

2 changes: 1 addition & 1 deletion src/librustc/middle/trans/closure.rs
Original file line number Diff line number Diff line change
@@ -384,7 +384,7 @@ pub fn trans_expr_fn<'a>(

let sub_path = vec::append_one(bcx.fcx.path.clone(),
PathName(special_idents::anon));
// XXX: Bad copy.
// FIXME: Bad copy.
let s = mangle_internal_name_by_path_and_seq(ccx,
sub_path.clone(),
"expr_fn");
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/consts.rs
Original file line number Diff line number Diff line change
@@ -283,7 +283,7 @@ pub fn const_expr(cx: @CrateContext, e: &ast::Expr) -> (ValueRef, bool) {
let tsize = machine::llsize_of_alloc(cx, llty);
if csize != tsize {
unsafe {
// XXX these values could use some context
// FIXME these values could use some context
llvm::LLVMDumpValue(llconst);
llvm::LLVMDumpValue(C_undef(llty));
}
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/intrinsic.rs
Original file line number Diff line number Diff line change
@@ -417,7 +417,7 @@ pub fn trans_intrinsic(ccx: @CrateContext,
RetVoid(bcx);
}
"morestack_addr" => {
// XXX This is a hack to grab the address of this particular
// FIXME This is a hack to grab the address of this particular
// native function. There should be a general in-language
// way to do this
let llfty = type_of_rust_fn(bcx.ccx(), None, [], ty::mk_nil());
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/meth.rs
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ pub fn trans_impl(ccx: @CrateContext,
/// * `llfn`: a closure returning the LLVM ValueRef for the method
/// * `impl_id`: the node ID of the impl this method is inside
///
/// XXX(pcwalton) Can we take `path` by reference?
/// FIXME(pcwalton) Can we take `path` by reference?
pub fn trans_method(ccx: @CrateContext,
path: Path,
method: &ast::Method,
Loading