about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-04-09 15:54:28 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-04-10 00:24:43 +0530
commit5daee19eca622030c598042d9615df17d4ad035f (patch)
treee69748a12da9881b913c4ef90bf65ff23a8efd00 /src
parent4e466e730b18645e73c2e4a841f6e675c82ceb22 (diff)
parentec7c800d2fc0dc5918d325ae68d88c9708d20259 (diff)
downloadrust-5daee19eca622030c598042d9615df17d4ad035f.tar.gz
rust-5daee19eca622030c598042d9615df17d4ad035f.zip
Rollup merge of #24212 - alexcrichton:destabilize-begin-unwind, r=huonw
 Now that we have a `#[allow_internal_unstable]` attribute for macros there's no
need for these two `begin_unwind` functions to be stable. Right now the `panic!`
interface is the only one we wish to stabilize, so remove the stability markers
from these functions.

While this is a breaking change, it is highly unlikely to break any actual code.
It is recommended to use the `panic!` macro instead if it breaks explicit calls
into `std::rt`.

[breaking-change]
cc #24208
Diffstat (limited to 'src')
-rw-r--r--src/libstd/macros.rs1
-rw-r--r--src/libstd/rt/unwind.rs3
-rw-r--r--src/test/run-pass-fulldeps/rename-directory.rs1
-rw-r--r--src/test/run-pass/argument-passing.rs1
-rw-r--r--src/test/run-pass/arith-2.rs1
-rw-r--r--src/test/run-pass/arith-unsigned.rs1
-rw-r--r--src/test/run-pass/artificial-block.rs1
-rw-r--r--src/test/run-pass/as-precedence.rs1
-rw-r--r--src/test/run-pass/asm-in-out-operand.rs1
-rw-r--r--src/test/run-pass/asm-out-assign.rs1
-rw-r--r--src/test/run-pass/assign-assign.rs1
-rw-r--r--src/test/run-pass/assignability-trait.rs1
-rw-r--r--src/test/run-pass/associated-types-basic.rs1
-rw-r--r--src/test/run-pass/associated-types-binding-in-trait.rs1
-rw-r--r--src/test/run-pass/associated-types-bound.rs1
-rw-r--r--src/test/run-pass/associated-types-constant-type.rs1
-rw-r--r--src/test/run-pass/associated-types-doubleendediterator-object.rs1
-rw-r--r--src/test/run-pass/associated-types-enum-field-named.rs1
-rw-r--r--src/test/run-pass/associated-types-enum-field-numbered.rs1
-rw-r--r--src/test/run-pass/associated-types-in-default-method.rs1
-rw-r--r--src/test/run-pass/associated-types-in-fn.rs1
-rw-r--r--src/test/run-pass/associated-types-in-impl-generics.rs1
-rw-r--r--src/test/run-pass/associated-types-in-inherent-method.rs1
-rw-r--r--src/test/run-pass/associated-types-issue-20220.rs1
-rw-r--r--src/test/run-pass/associated-types-issue-21212.rs1
-rw-r--r--src/test/run-pass/associated-types-iterator-binding.rs1
-rw-r--r--src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where-clause.rs1
-rw-r--r--src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs1
-rw-r--r--src/test/run-pass/associated-types-projection-in-supertrait.rs1
-rw-r--r--src/test/run-pass/associated-types-ref-in-struct-literal.rs1
-rw-r--r--src/test/run-pass/associated-types-return.rs1
-rw-r--r--src/test/run-pass/associated-types-simple.rs1
-rw-r--r--src/test/run-pass/associated-types-stream.rs1
-rw-r--r--src/test/run-pass/associated-types-struct-field-named.rs1
-rw-r--r--src/test/run-pass/associated-types-struct-field-numbered.rs1
-rw-r--r--src/test/run-pass/associated-types-sugar-path.rs1
-rw-r--r--src/test/run-pass/attr-main-2.rs1
-rw-r--r--src/test/run-pass/attr-no-drop-flag-size.rs1
-rw-r--r--src/test/run-pass/auto-loop.rs1
-rw-r--r--src/test/run-pass/auto-ref-sliceable.rs1
-rw-r--r--src/test/run-pass/autobind.rs1
-rw-r--r--src/test/run-pass/autoderef-method-on-trait.rs1
-rw-r--r--src/test/run-pass/autoderef-method-priority.rs1
-rw-r--r--src/test/run-pass/autoderef-method-twice-but-not-thrice.rs1
-rw-r--r--src/test/run-pass/autoderef-method-twice.rs1
-rw-r--r--src/test/run-pass/autoderef-method.rs1
-rw-r--r--src/test/run-pass/autoref-intermediate-types-issue-3585.rs1
-rw-r--r--src/test/run-pass/big-literals.rs1
-rw-r--r--src/test/run-pass/binary-minus-without-space.rs1
-rw-r--r--src/test/run-pass/bind-by-move.rs1
-rw-r--r--src/test/run-pass/bind-field-short-with-modifiers.rs1
-rw-r--r--src/test/run-pass/block-arg-call-as.rs1
-rw-r--r--src/test/run-pass/block-expr-precedence.rs1
-rw-r--r--src/test/run-pass/block-fn-coerce.rs1
-rw-r--r--src/test/run-pass/bool-not.rs1
-rw-r--r--src/test/run-pass/bool.rs1
-rw-r--r--src/test/run-pass/borrow-tuple-fields.rs1
-rw-r--r--src/test/run-pass/borrowck-borrow-from-expr-block.rs1
-rw-r--r--src/test/run-pass/borrowck-closures-two-imm.rs1
-rw-r--r--src/test/run-pass/borrowck-fixed-length-vecs.rs1
-rw-r--r--src/test/run-pass/borrowck-freeze-frozen-mut.rs1
-rw-r--r--src/test/run-pass/borrowck-macro-interaction-issue-6304.rs1
-rw-r--r--src/test/run-pass/borrowck-move-by-capture-ok.rs1
-rw-r--r--src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs1
-rw-r--r--src/test/run-pass/borrowck-pat-reassign-no-binding.rs1
-rw-r--r--src/test/run-pass/borrowck-rvalues-mutable.rs1
-rw-r--r--src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs1
-rw-r--r--src/test/run-pass/borrowck-univariant-enum.rs1
-rw-r--r--src/test/run-pass/borrowed-ptr-pattern-2.rs1
-rw-r--r--src/test/run-pass/borrowed-ptr-pattern-3.rs1
-rw-r--r--src/test/run-pass/borrowed-ptr-pattern-infallible.rs1
-rw-r--r--src/test/run-pass/borrowed-ptr-pattern-option.rs1
-rw-r--r--src/test/run-pass/borrowed-ptr-pattern.rs1
-rw-r--r--src/test/run-pass/break.rs1
-rw-r--r--src/test/run-pass/bug-7183-generics.rs1
-rw-r--r--src/test/run-pass/builtin-superkinds-capabilities-transitive.rs1
-rw-r--r--src/test/run-pass/builtin-superkinds-capabilities-xc.rs1
-rw-r--r--src/test/run-pass/builtin-superkinds-capabilities.rs1
-rw-r--r--src/test/run-pass/builtin-superkinds-self-type.rs1
-rw-r--r--src/test/run-pass/by-value-self-in-mut-slot.rs1
-rw-r--r--src/test/run-pass/call-closure-from-overloaded-op.rs1
-rw-r--r--src/test/run-pass/capture-clauses-boxed-closures.rs1
-rw-r--r--src/test/run-pass/capture-clauses-unboxed-closures.rs1
-rw-r--r--src/test/run-pass/cast.rs1
-rw-r--r--src/test/run-pass/cci_nested_exe.rs1
-rw-r--r--src/test/run-pass/cell-does-not-clone.rs1
-rw-r--r--src/test/run-pass/cfg-macros-foo.rs1
-rw-r--r--src/test/run-pass/cfg-macros-notfoo.rs1
-rw-r--r--src/test/run-pass/cfgs-on-items.rs1
-rw-r--r--src/test/run-pass/char.rs1
-rw-r--r--src/test/run-pass/check-static-mut-slices.rs1
-rw-r--r--src/test/run-pass/check-static-slice.rs1
-rw-r--r--src/test/run-pass/class-exports.rs1
-rw-r--r--src/test/run-pass/class-method-cross-crate.rs1
-rw-r--r--src/test/run-pass/class-methods-cross-crate.rs1
-rw-r--r--src/test/run-pass/class-methods.rs1
-rw-r--r--src/test/run-pass/class-poly-methods-cross-crate.rs1
-rw-r--r--src/test/run-pass/class-poly-methods.rs1
-rw-r--r--src/test/run-pass/classes-cross-crate.rs1
-rw-r--r--src/test/run-pass/classes-simple-cross-crate.rs1
-rw-r--r--src/test/run-pass/classes-simple-method.rs1
-rw-r--r--src/test/run-pass/classes-simple.rs1
-rw-r--r--src/test/run-pass/cleanup-rvalue-during-if-and-while.rs1
-rw-r--r--src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs1
-rw-r--r--src/test/run-pass/closure-inference.rs1
-rw-r--r--src/test/run-pass/closure-inference2.rs1
-rw-r--r--src/test/run-pass/cmp-default.rs1
-rw-r--r--src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs1
-rw-r--r--src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs1
-rw-r--r--src/test/run-pass/coerce-reborrow-mut-vec-arg.rs1
-rw-r--r--src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs1
-rw-r--r--src/test/run-pass/compare-generic-enums.rs1
-rw-r--r--src/test/run-pass/concat.rs1
-rw-r--r--src/test/run-pass/conditional-compile.rs1
-rw-r--r--src/test/run-pass/conditional-debug-macro-off.rs1
-rw-r--r--src/test/run-pass/const-autoderef.rs1
-rw-r--r--src/test/run-pass/const-big-enum.rs1
-rw-r--r--src/test/run-pass/const-binops.rs1
-rw-r--r--src/test/run-pass/const-block-cross-crate-fn.rs1
-rw-r--r--src/test/run-pass/const-block-item-macro-codegen.rs1
-rw-r--r--src/test/run-pass/const-block-item.rs1
-rw-r--r--src/test/run-pass/const-block.rs1
-rw-r--r--src/test/run-pass/const-cast-ptr-int.rs1
-rw-r--r--src/test/run-pass/const-cast.rs1
-rw-r--r--src/test/run-pass/const-const.rs1
-rw-r--r--src/test/run-pass/const-contents.rs1
-rw-r--r--src/test/run-pass/const-cross-crate-const.rs1
-rw-r--r--src/test/run-pass/const-cross-crate-extern.rs1
-rw-r--r--src/test/run-pass/const-deref.rs1
-rw-r--r--src/test/run-pass/const-enum-byref-self.rs1
-rw-r--r--src/test/run-pass/const-enum-byref.rs1
-rw-r--r--src/test/run-pass/const-enum-cast.rs1
-rw-r--r--src/test/run-pass/const-enum-ptr.rs1
-rw-r--r--src/test/run-pass/const-enum-struct.rs1
-rw-r--r--src/test/run-pass/const-enum-struct2.rs1
-rw-r--r--src/test/run-pass/const-enum-structlike.rs1
-rw-r--r--src/test/run-pass/const-enum-tuple.rs1
-rw-r--r--src/test/run-pass/const-enum-tuple2.rs1
-rw-r--r--src/test/run-pass/const-enum-tuplestruct.rs1
-rw-r--r--src/test/run-pass/const-enum-tuplestruct2.rs1
-rw-r--r--src/test/run-pass/const-enum-vec-index.rs1
-rw-r--r--src/test/run-pass/const-enum-vec-ptr.rs1
-rw-r--r--src/test/run-pass/const-enum-vector.rs1
-rw-r--r--src/test/run-pass/const-extern-function.rs1
-rw-r--r--src/test/run-pass/const-fn-val.rs1
-rw-r--r--src/test/run-pass/const-negative.rs1
-rw-r--r--src/test/run-pass/const-nullary-enum.rs1
-rw-r--r--src/test/run-pass/const-nullary-univariant-enum.rs1
-rw-r--r--src/test/run-pass/const-region-ptrs-noncopy.rs1
-rw-r--r--src/test/run-pass/const-str-ptr.rs1
-rw-r--r--src/test/run-pass/const-tuple-struct.rs1
-rw-r--r--src/test/run-pass/consts-in-patterns.rs1
-rw-r--r--src/test/run-pass/cross-crate-newtype-struct-pat.rs1
-rw-r--r--src/test/run-pass/deep.rs1
-rw-r--r--src/test/run-pass/deref-mut-on-ref.rs1
-rw-r--r--src/test/run-pass/deref-on-ref.rs1
-rw-r--r--src/test/run-pass/deref-rc.rs1
-rw-r--r--src/test/run-pass/deriving-cmp-generic-enum.rs1
-rw-r--r--src/test/run-pass/deriving-cmp-generic-struct-enum.rs1
-rw-r--r--src/test/run-pass/deriving-cmp-generic-struct.rs1
-rw-r--r--src/test/run-pass/deriving-cmp-generic-tuple-struct.rs1
-rw-r--r--src/test/run-pass/deriving-cmp-shortcircuit.rs1
-rw-r--r--src/test/run-pass/deriving-default-box.rs1
-rw-r--r--src/test/run-pass/deriving-encodable-decodable-box.rs1
-rw-r--r--src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs1
-rw-r--r--src/test/run-pass/deriving-hash.rs1
-rw-r--r--src/test/run-pass/deriving-rand.rs1
-rw-r--r--src/test/run-pass/destructure-array-1.rs1
-rw-r--r--src/test/run-pass/die-macro.rs1
-rw-r--r--src/test/run-pass/div-mod.rs1
-rw-r--r--src/test/run-pass/drop-struct-as-object.rs1
-rw-r--r--src/test/run-pass/drop-with-type-ascription-1.rs1
-rw-r--r--src/test/run-pass/drop-with-type-ascription-2.rs1
-rw-r--r--src/test/run-pass/dropck_tarena_sound_drop.rs1
-rw-r--r--src/test/run-pass/dst-deref-mut.rs1
-rw-r--r--src/test/run-pass/dst-deref.rs1
-rw-r--r--src/test/run-pass/dst-index.rs1
-rw-r--r--src/test/run-pass/dst-raw.rs1
-rw-r--r--src/test/run-pass/dst-struct-sole.rs1
-rw-r--r--src/test/run-pass/dst-struct.rs1
-rw-r--r--src/test/run-pass/dst-trait.rs1
-rw-r--r--src/test/run-pass/else-if.rs1
-rw-r--r--src/test/run-pass/empty-allocation-non-null.rs1
-rw-r--r--src/test/run-pass/enum-alignment.rs1
-rw-r--r--src/test/run-pass/enum-clike-ffi-as-int.rs1
-rw-r--r--src/test/run-pass/enum-discr.rs1
-rw-r--r--src/test/run-pass/enum-discrim-autosizing.rs1
-rw-r--r--src/test/run-pass/enum-discrim-manual-sizing.rs1
-rw-r--r--src/test/run-pass/enum-disr-val-pretty.rs1
-rw-r--r--src/test/run-pass/enum-null-pointer-opt.rs1
-rw-r--r--src/test/run-pass/enum-nullable-const-null-with-fields.rs1
-rw-r--r--src/test/run-pass/enum-nullable-simplifycfg-misopt.rs1
-rw-r--r--src/test/run-pass/env-home-dir.rs1
-rw-r--r--src/test/run-pass/env-vars.rs1
-rw-r--r--src/test/run-pass/eq-multidispatch.rs1
-rw-r--r--src/test/run-pass/estr-uniq.rs1
-rw-r--r--src/test/run-pass/exec-env.rs1
-rw-r--r--src/test/run-pass/explicit-self-generic.rs1
-rw-r--r--src/test/run-pass/explicit-self-objects-uniq.rs1
-rw-r--r--src/test/run-pass/explicit-self.rs1
-rw-r--r--src/test/run-pass/expr-block-fn.rs1
-rw-r--r--src/test/run-pass/expr-block-generic-unique2.rs1
-rw-r--r--src/test/run-pass/expr-block-generic.rs1
-rw-r--r--src/test/run-pass/expr-block-slot.rs1
-rw-r--r--src/test/run-pass/expr-block-unique.rs1
-rw-r--r--src/test/run-pass/expr-block.rs1
-rw-r--r--src/test/run-pass/expr-copy.rs1
-rw-r--r--src/test/run-pass/expr-fn.rs1
-rw-r--r--src/test/run-pass/expr-if-generic.rs1
-rw-r--r--src/test/run-pass/expr-if-panic-all.rs1
-rw-r--r--src/test/run-pass/expr-if-panic.rs1
-rw-r--r--src/test/run-pass/expr-if-unique.rs1
-rw-r--r--src/test/run-pass/expr-if.rs1
-rw-r--r--src/test/run-pass/expr-match-generic-unique1.rs1
-rw-r--r--src/test/run-pass/expr-match-generic-unique2.rs1
-rw-r--r--src/test/run-pass/expr-match-generic.rs1
-rw-r--r--src/test/run-pass/expr-match-panic-all.rs1
-rw-r--r--src/test/run-pass/expr-match-panic.rs1
-rw-r--r--src/test/run-pass/expr-match-unique.rs1
-rw-r--r--src/test/run-pass/expr-match.rs1
-rw-r--r--src/test/run-pass/ext-expand-inner-exprs.rs1
-rw-r--r--src/test/run-pass/exterior.rs1
-rw-r--r--src/test/run-pass/extern-call-direct.rs1
-rw-r--r--src/test/run-pass/extern-compare-with-return-type.rs1
-rw-r--r--src/test/run-pass/extern-methods.rs1
-rw-r--r--src/test/run-pass/extern-pass-char.rs1
-rw-r--r--src/test/run-pass/extern-pass-double.rs1
-rw-r--r--src/test/run-pass/extern-pass-u32.rs1
-rw-r--r--src/test/run-pass/extern-pass-u64.rs1
-rw-r--r--src/test/run-pass/extern-return-TwoU16s.rs1
-rw-r--r--src/test/run-pass/extern-return-TwoU32s.rs1
-rw-r--r--src/test/run-pass/extern-return-TwoU64s.rs1
-rw-r--r--src/test/run-pass/extern-return-TwoU8s.rs1
-rw-r--r--src/test/run-pass/extern-take-value.rs1
-rw-r--r--src/test/run-pass/extoption_env-not-defined.rs1
-rw-r--r--src/test/run-pass/field-destruction-order.rs1
-rw-r--r--src/test/run-pass/fixed_length_copy.rs1
-rw-r--r--src/test/run-pass/float2.rs1
-rw-r--r--src/test/run-pass/floatlits.rs1
-rw-r--r--src/test/run-pass/fn-bare-assign.rs1
-rw-r--r--src/test/run-pass/fn-bare-size.rs1
-rw-r--r--src/test/run-pass/fn-bare-spawn.rs1
-rw-r--r--src/test/run-pass/fn-item-type-cast.rs1
-rw-r--r--src/test/run-pass/fn-pattern-expected-type.rs1
-rw-r--r--src/test/run-pass/for-destruct.rs1
-rw-r--r--src/test/run-pass/for-loop-goofiness.rs1
-rw-r--r--src/test/run-pass/for-loop-into-iterator.rs1
-rw-r--r--src/test/run-pass/for-loop-panic.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators-break.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators-hashmap.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators-loop.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators-nested.rs1
-rw-r--r--src/test/run-pass/foreach-external-iterators.rs1
-rw-r--r--src/test/run-pass/foreach-nested.rs1
-rw-r--r--src/test/run-pass/foreign-fn-with-byval.rs1
-rw-r--r--src/test/run-pass/format-nan.rs1
-rw-r--r--src/test/run-pass/format-ref-cell.rs1
-rw-r--r--src/test/run-pass/fsu-moves-and-copies.rs1
-rw-r--r--src/test/run-pass/fun-call-variants.rs1
-rw-r--r--src/test/run-pass/fun-indirect-call.rs1
-rw-r--r--src/test/run-pass/func-arg-incomplete-pattern.rs1
-rw-r--r--src/test/run-pass/func-arg-ref-pattern.rs1
-rw-r--r--src/test/run-pass/func-arg-wild-pattern.rs1
-rw-r--r--src/test/run-pass/generic-exterior-unique.rs1
-rw-r--r--src/test/run-pass/generic-extern-mangle.rs1
-rw-r--r--src/test/run-pass/generic-fn-infer.rs1
-rw-r--r--src/test/run-pass/generic-object.rs1
-rw-r--r--src/test/run-pass/generic-static-methods.rs1
-rw-r--r--src/test/run-pass/generic-type.rs1
-rw-r--r--src/test/run-pass/generic-unique.rs1
-rw-r--r--src/test/run-pass/getopts_ref.rs1
-rw-r--r--src/test/run-pass/global-scope.rs1
-rw-r--r--src/test/run-pass/guards-not-exhaustive.rs1
-rw-r--r--src/test/run-pass/guards.rs1
-rw-r--r--src/test/run-pass/hrtb-fn-like-trait-object.rs1
-rw-r--r--src/test/run-pass/hrtb-fn-like-trait.rs1
-rw-r--r--src/test/run-pass/hrtb-trait-object-paren-notation.rs1
-rw-r--r--src/test/run-pass/huge-largest-array.rs1
-rw-r--r--src/test/run-pass/hygiene-dodging-1.rs1
-rw-r--r--src/test/run-pass/hygienic-labels.rs1
-rw-r--r--src/test/run-pass/i32-sub.rs1
-rw-r--r--src/test/run-pass/i8-incr.rs1
-rw-r--r--src/test/run-pass/if-let.rs1
-rw-r--r--src/test/run-pass/impl-inherent-non-conflict.rs1
-rw-r--r--src/test/run-pass/impl-inherent-prefer-over-trait.rs1
-rw-r--r--src/test/run-pass/impl-not-adjacent-to-type.rs1
-rw-r--r--src/test/run-pass/import-glob-crate.rs1
-rw-r--r--src/test/run-pass/inferred-suffix-in-pattern-range.rs1
-rw-r--r--src/test/run-pass/inherent-trait-method-order.rs1
-rw-r--r--src/test/run-pass/init-res-into-things.rs1
-rw-r--r--src/test/run-pass/inner-attrs-on-impl.rs1
-rw-r--r--src/test/run-pass/inner-static.rs1
-rw-r--r--src/test/run-pass/integer-literal-radix.rs1
-rw-r--r--src/test/run-pass/intrinsic-alignment.rs1
-rw-r--r--src/test/run-pass/intrinsic-assume.rs1
-rw-r--r--src/test/run-pass/intrinsic-atomics-cc.rs1
-rw-r--r--src/test/run-pass/intrinsic-atomics.rs1
-rw-r--r--src/test/run-pass/intrinsic-move-val.rs1
-rw-r--r--src/test/run-pass/intrinsic-return-address.rs1
-rw-r--r--src/test/run-pass/intrinsic-unreachable.rs1
-rw-r--r--src/test/run-pass/intrinsics-integer.rs1
-rw-r--r--src/test/run-pass/intrinsics-math.rs1
-rw-r--r--src/test/run-pass/issue-10392.rs1
-rw-r--r--src/test/run-pass/issue-10734.rs1
-rw-r--r--src/test/run-pass/issue-10802.rs1
-rw-r--r--src/test/run-pass/issue-1112.rs1
-rw-r--r--src/test/run-pass/issue-11552.rs1
-rw-r--r--src/test/run-pass/issue-11577.rs1
-rw-r--r--src/test/run-pass/issue-11677.rs1
-rw-r--r--src/test/run-pass/issue-11940.rs1
-rw-r--r--src/test/run-pass/issue-12285.rs1
-rw-r--r--src/test/run-pass/issue-12677.rs1
-rw-r--r--src/test/run-pass/issue-13204.rs1
-rw-r--r--src/test/run-pass/issue-13323.rs1
-rw-r--r--src/test/run-pass/issue-13507-2.rs1
-rw-r--r--src/test/run-pass/issue-13867.rs1
-rw-r--r--src/test/run-pass/issue-14308.rs1
-rw-r--r--src/test/run-pass/issue-14456.rs1
-rw-r--r--src/test/run-pass/issue-14865.rs1
-rw-r--r--src/test/run-pass/issue-14936.rs1
-rw-r--r--src/test/run-pass/issue-14940.rs1
-rw-r--r--src/test/run-pass/issue-15080.rs1
-rw-r--r--src/test/run-pass/issue-15104.rs1
-rw-r--r--src/test/run-pass/issue-15129.rs1
-rw-r--r--src/test/run-pass/issue-15149.rs1
-rw-r--r--src/test/run-pass/issue-15673.rs1
-rw-r--r--src/test/run-pass/issue-15689-1.rs1
-rw-r--r--src/test/run-pass/issue-15734.rs1
-rw-r--r--src/test/run-pass/issue-15793.rs1
-rw-r--r--src/test/run-pass/issue-15858.rs1
-rw-r--r--src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs1
-rw-r--r--src/test/run-pass/issue-16151.rs1
-rw-r--r--src/test/run-pass/issue-16530.rs1
-rw-r--r--src/test/run-pass/issue-16560.rs1
-rw-r--r--src/test/run-pass/issue-16596.rs1
-rw-r--r--src/test/run-pass/issue-16648.rs1
-rw-r--r--src/test/run-pass/issue-16739.rs1
-rw-r--r--src/test/run-pass/issue-16774.rs1
-rw-r--r--src/test/run-pass/issue-1701.rs1
-rw-r--r--src/test/run-pass/issue-17068.rs1
-rw-r--r--src/test/run-pass/issue-17074.rs1
-rw-r--r--src/test/run-pass/issue-17216.rs1
-rw-r--r--src/test/run-pass/issue-17233.rs1
-rw-r--r--src/test/run-pass/issue-17302.rs1
-rw-r--r--src/test/run-pass/issue-17662.rs1
-rw-r--r--src/test/run-pass/issue-17718-parse-const.rs1
-rw-r--r--src/test/run-pass/issue-17718.rs1
-rw-r--r--src/test/run-pass/issue-17734.rs1
-rw-r--r--src/test/run-pass/issue-17877.rs1
-rw-r--r--src/test/run-pass/issue-18352.rs1
-rw-r--r--src/test/run-pass/issue-18412.rs1
-rw-r--r--src/test/run-pass/issue-18652.rs1
-rw-r--r--src/test/run-pass/issue-18767.rs1
-rw-r--r--src/test/run-pass/issue-18859.rs1
-rw-r--r--src/test/run-pass/issue-19244.rs1
-rw-r--r--src/test/run-pass/issue-19811-escape-unicode.rs1
-rw-r--r--src/test/run-pass/issue-21058.rs1
-rw-r--r--src/test/run-pass/issue-21306.rs1
-rw-r--r--src/test/run-pass/issue-21361.rs1
-rw-r--r--src/test/run-pass/issue-21384.rs1
-rw-r--r--src/test/run-pass/issue-21634.rs1
-rw-r--r--src/test/run-pass/issue-21655.rs1
-rw-r--r--src/test/run-pass/issue-21721.rs1
-rw-r--r--src/test/run-pass/issue-22036.rs1
-rw-r--r--src/test/run-pass/issue-2214.rs1
-rw-r--r--src/test/run-pass/issue-22536-copy-mustnt-zero.rs1
-rw-r--r--src/test/run-pass/issue-2311-2.rs1
-rw-r--r--src/test/run-pass/issue-2312.rs1
-rw-r--r--src/test/run-pass/issue-2428.rs1
-rw-r--r--src/test/run-pass/issue-2611-3.rs1
-rw-r--r--src/test/run-pass/issue-2735-2.rs1
-rw-r--r--src/test/run-pass/issue-2735-3.rs1
-rw-r--r--src/test/run-pass/issue-2748-b.rs1
-rw-r--r--src/test/run-pass/issue-2895.rs1
-rw-r--r--src/test/run-pass/issue-2936.rs1
-rw-r--r--src/test/run-pass/issue-3091.rs1
-rw-r--r--src/test/run-pass/issue-3290.rs1
-rw-r--r--src/test/run-pass/issue-333.rs1
-rw-r--r--src/test/run-pass/issue-3574.rs1
-rw-r--r--src/test/run-pass/issue-3895.rs1
-rw-r--r--src/test/run-pass/issue-3935.rs1
-rw-r--r--src/test/run-pass/issue-3979-generics.rs1
-rw-r--r--src/test/run-pass/issue-3979-xcrate.rs1
-rw-r--r--src/test/run-pass/issue-3979.rs1
-rw-r--r--src/test/run-pass/issue-4016.rs1
-rw-r--r--src/test/run-pass/issue-4107.rs1
-rw-r--r--src/test/run-pass/issue-4448.rs1
-rw-r--r--src/test/run-pass/issue-4734.rs1
-rw-r--r--src/test/run-pass/issue-5239-2.rs1
-rw-r--r--src/test/run-pass/issue-5521.rs1
-rw-r--r--src/test/run-pass/issue-5530.rs1
-rw-r--r--src/test/run-pass/issue-5917.rs1
-rw-r--r--src/test/run-pass/issue-5997.rs1
-rw-r--r--src/test/run-pass/issue-6128.rs1
-rw-r--r--src/test/run-pass/issue-6130.rs1
-rw-r--r--src/test/run-pass/issue-6153.rs1
-rw-r--r--src/test/run-pass/issue-6334.rs1
-rw-r--r--src/test/run-pass/issue-6449.rs1
-rw-r--r--src/test/run-pass/issue-6892.rs1
-rw-r--r--src/test/run-pass/issue-7575.rs1
-rw-r--r--src/test/run-pass/issue-7663.rs1
-rw-r--r--src/test/run-pass/issue-7784.rs1
-rw-r--r--src/test/run-pass/issue-8351-1.rs1
-rw-r--r--src/test/run-pass/issue-8351-2.rs1
-rw-r--r--src/test/run-pass/issue-8391.rs1
-rw-r--r--src/test/run-pass/issue-8460.rs1
-rw-r--r--src/test/run-pass/issue-8498.rs1
-rw-r--r--src/test/run-pass/issue-8709.rs1
-rw-r--r--src/test/run-pass/issue-8860.rs1
-rw-r--r--src/test/run-pass/issue-8898.rs1
-rw-r--r--src/test/run-pass/issue-9188.rs1
-rw-r--r--src/test/run-pass/issue-9259.rs1
-rw-r--r--src/test/run-pass/issue-9394-inherited-trait-calls.rs1
-rw-r--r--src/test/run-pass/issue-979.rs1
-rw-r--r--src/test/run-pass/issue-9918.rs1
-rw-r--r--src/test/run-pass/iter-cloned-type-inference.rs1
-rw-r--r--src/test/run-pass/kindck-owned-trait-contains-1.rs1
-rw-r--r--src/test/run-pass/last-use-in-block.rs1
-rw-r--r--src/test/run-pass/last-use-in-cap-clause.rs1
-rw-r--r--src/test/run-pass/let-destruct-ref.rs1
-rw-r--r--src/test/run-pass/let-var-hygiene.rs1
-rw-r--r--src/test/run-pass/logging-enabled-debug.rs1
-rw-r--r--src/test/run-pass/logging-enabled.rs1
-rw-r--r--src/test/run-pass/loop-break-cont-1.rs1
-rw-r--r--src/test/run-pass/loop-scope.rs1
-rw-r--r--src/test/run-pass/macro-block-nonterminal.rs1
-rw-r--r--src/test/run-pass/macro-crate-def-only.rs1
-rw-r--r--src/test/run-pass/macro-crate-use.rs1
-rw-r--r--src/test/run-pass/macro-deep_expansion.rs1
-rw-r--r--src/test/run-pass/macro-interpolation.rs1
-rw-r--r--src/test/run-pass/macro-method-issue-4621.rs1
-rw-r--r--src/test/run-pass/macro-of-higher-order.rs1
-rw-r--r--src/test/run-pass/macro-pat.rs1
-rw-r--r--src/test/run-pass/macro-path.rs1
-rw-r--r--src/test/run-pass/macro-with-attrs1.rs1
-rw-r--r--src/test/run-pass/macro-with-attrs2.rs1
-rw-r--r--src/test/run-pass/match-arm-statics.rs1
-rw-r--r--src/test/run-pass/match-borrowed_str.rs1
-rw-r--r--src/test/run-pass/match-bot-2.rs1
-rw-r--r--src/test/run-pass/match-enum-struct-0.rs1
-rw-r--r--src/test/run-pass/match-enum-struct-1.rs1
-rw-r--r--src/test/run-pass/match-implicit-copy-unique.rs1
-rw-r--r--src/test/run-pass/match-in-macro.rs1
-rw-r--r--src/test/run-pass/match-pattern-bindings.rs1
-rw-r--r--src/test/run-pass/match-pipe-binding.rs1
-rw-r--r--src/test/run-pass/match-ref-binding-in-guard-3256.rs1
-rw-r--r--src/test/run-pass/match-ref-binding-mut-option.rs1
-rw-r--r--src/test/run-pass/match-ref-binding-mut.rs1
-rw-r--r--src/test/run-pass/match-ref-binding.rs1
-rw-r--r--src/test/run-pass/match-static-const-rename.rs1
-rw-r--r--src/test/run-pass/match-str.rs1
-rw-r--r--src/test/run-pass/match-struct-0.rs1
-rw-r--r--src/test/run-pass/match-tag.rs1
-rw-r--r--src/test/run-pass/match-vec-alternatives.rs1
-rw-r--r--src/test/run-pass/match-vec-rvalue.rs1
-rw-r--r--src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs1
-rw-r--r--src/test/run-pass/method-projection.rs1
-rw-r--r--src/test/run-pass/method-self-arg-aux1.rs1
-rw-r--r--src/test/run-pass/method-self-arg-aux2.rs1
-rw-r--r--src/test/run-pass/method-self-arg-trait.rs1
-rw-r--r--src/test/run-pass/method-self-arg.rs1
-rw-r--r--src/test/run-pass/method-two-trait-defer-resolution-1.rs1
-rw-r--r--src/test/run-pass/method-two-trait-defer-resolution-2.rs1
-rw-r--r--src/test/run-pass/method-where-clause.rs1
-rw-r--r--src/test/run-pass/mod-inside-fn.rs1
-rw-r--r--src/test/run-pass/monad.rs1
-rw-r--r--src/test/run-pass/move-1-unique.rs1
-rw-r--r--src/test/run-pass/move-2-unique.rs1
-rw-r--r--src/test/run-pass/move-2.rs1
-rw-r--r--src/test/run-pass/move-3-unique.rs1
-rw-r--r--src/test/run-pass/move-4-unique.rs1
-rw-r--r--src/test/run-pass/move-4.rs1
-rw-r--r--src/test/run-pass/move-arg-2-unique.rs1
-rw-r--r--src/test/run-pass/move-arg-2.rs1
-rw-r--r--src/test/run-pass/move-arg.rs1
-rw-r--r--src/test/run-pass/move-out-of-field.rs1
-rw-r--r--src/test/run-pass/move-scalar.rs1
-rw-r--r--src/test/run-pass/multi-let.rs1
-rw-r--r--src/test/run-pass/multidispatch1.rs1
-rw-r--r--src/test/run-pass/multidispatch2.rs1
-rw-r--r--src/test/run-pass/mut-function-arguments.rs1
-rw-r--r--src/test/run-pass/mut-in-ident-patterns.rs1
-rw-r--r--src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs1
-rw-r--r--src/test/run-pass/negative.rs1
-rw-r--r--src/test/run-pass/nested-class.rs1
-rw-r--r--src/test/run-pass/nested-function-names-issue-8587.rs1
-rw-r--r--src/test/run-pass/nested_item_main.rs1
-rw-r--r--src/test/run-pass/new-unicode-escapes.rs1
-rw-r--r--src/test/run-pass/newlambdas.rs1
-rw-r--r--src/test/run-pass/newtype-polymorphic.rs1
-rw-r--r--src/test/run-pass/newtype-struct-drop-run.rs1
-rw-r--r--src/test/run-pass/no-landing-pads.rs1
-rw-r--r--src/test/run-pass/non-legacy-modes.rs1
-rw-r--r--src/test/run-pass/nul-characters.rs1
-rw-r--r--src/test/run-pass/nullable-pointer-ffi-compat.rs1
-rw-r--r--src/test/run-pass/nullable-pointer-iotareduction.rs1
-rw-r--r--src/test/run-pass/nullable-pointer-size.rs1
-rw-r--r--src/test/run-pass/nullary-or-pattern.rs1
-rw-r--r--src/test/run-pass/numeric-method-autoexport.rs1
-rw-r--r--src/test/run-pass/object-method-numbering.rs1
-rw-r--r--src/test/run-pass/object-safety-sized-self-by-value-self.rs1
-rw-r--r--src/test/run-pass/object-safety-sized-self-generic-method.rs1
-rw-r--r--src/test/run-pass/object-safety-sized-self-return-Self.rs1
-rw-r--r--src/test/run-pass/objects-coerce-freeze-borrored.rs1
-rw-r--r--src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs1
-rw-r--r--src/test/run-pass/objects-owned-object-owned-method.rs1
-rw-r--r--src/test/run-pass/once-move-out-on-heap.rs1
-rw-r--r--src/test/run-pass/one-tuple.rs1
-rw-r--r--src/test/run-pass/operator-associativity.rs1
-rw-r--r--src/test/run-pass/option-unwrap.rs1
-rw-r--r--src/test/run-pass/or-pattern.rs1
-rw-r--r--src/test/run-pass/order-drop-with-match.rs1
-rw-r--r--src/test/run-pass/out-pointer-aliasing.rs1
-rw-r--r--src/test/run-pass/overloaded-autoderef-indexing.rs1
-rw-r--r--src/test/run-pass/overloaded-autoderef-order.rs1
-rw-r--r--src/test/run-pass/overloaded-autoderef-vtable.rs1
-rw-r--r--src/test/run-pass/overloaded-autoderef-xcrate.rs1
-rw-r--r--src/test/run-pass/overloaded-calls-object-one-arg.rs1
-rw-r--r--src/test/run-pass/overloaded-calls-object-two-args.rs1
-rw-r--r--src/test/run-pass/overloaded-calls-object-zero-args.rs1
-rw-r--r--src/test/run-pass/overloaded-calls-simple.rs1
-rw-r--r--src/test/run-pass/overloaded-calls-zero-args.rs1
-rw-r--r--src/test/run-pass/overloaded-deref-count.rs1
-rw-r--r--src/test/run-pass/overloaded-index-assoc-list.rs1
-rw-r--r--src/test/run-pass/overloaded-index-autoderef.rs1
-rw-r--r--src/test/run-pass/overloaded-index-in-field.rs1
-rw-r--r--src/test/run-pass/overloaded-index.rs1
-rw-r--r--src/test/run-pass/packed-struct-borrow-element.rs1
-rw-r--r--src/test/run-pass/packed-struct-generic-layout.rs1
-rw-r--r--src/test/run-pass/packed-struct-generic-size.rs1
-rw-r--r--src/test/run-pass/packed-struct-layout.rs1
-rw-r--r--src/test/run-pass/packed-struct-match.rs1
-rw-r--r--src/test/run-pass/packed-struct-size-xc.rs1
-rw-r--r--src/test/run-pass/packed-struct-size.rs1
-rw-r--r--src/test/run-pass/packed-tuple-struct-layout.rs1
-rw-r--r--src/test/run-pass/packed-tuple-struct-size.rs1
-rw-r--r--src/test/run-pass/panic-in-dtor-drops-fields.rs1
-rw-r--r--src/test/run-pass/pattern-bound-var-in-for-each.rs1
-rw-r--r--src/test/run-pass/private-class-field.rs1
-rw-r--r--src/test/run-pass/process-remove-from-env.rs1
-rw-r--r--src/test/run-pass/range-type-infer.rs1
-rw-r--r--src/test/run-pass/range.rs1
-rw-r--r--src/test/run-pass/ranges-precedence.rs1
-rw-r--r--src/test/run-pass/readalias.rs1
-rw-r--r--src/test/run-pass/rec-extend.rs1
-rw-r--r--src/test/run-pass/rec-tup.rs1
-rw-r--r--src/test/run-pass/rec.rs1
-rw-r--r--src/test/run-pass/record-pat.rs1
-rw-r--r--src/test/run-pass/reexported-static-methods-cross-crate.rs1
-rw-r--r--src/test/run-pass/regions-borrow-evec-fixed.rs1
-rw-r--r--src/test/run-pass/regions-borrow-evec-uniq.rs1
-rw-r--r--src/test/run-pass/regions-borrow-uniq.rs1
-rw-r--r--src/test/run-pass/regions-bot.rs1
-rw-r--r--src/test/run-pass/regions-close-over-type-parameter-successfully.rs1
-rw-r--r--src/test/run-pass/regions-copy-closure.rs1
-rw-r--r--src/test/run-pass/regions-dependent-addr-of.rs1
-rw-r--r--src/test/run-pass/regions-early-bound-trait-param.rs1
-rw-r--r--src/test/run-pass/regions-early-bound-used-in-bound-method.rs1
-rw-r--r--src/test/run-pass/regions-early-bound-used-in-bound.rs1
-rw-r--r--src/test/run-pass/regions-early-bound-used-in-type-param.rs1
-rw-r--r--src/test/run-pass/regions-escape-into-other-fn.rs1
-rw-r--r--src/test/run-pass/regions-infer-borrow-scope-addr-of.rs1
-rw-r--r--src/test/run-pass/regions-infer-borrow-scope-view.rs1
-rw-r--r--src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs1
-rw-r--r--src/test/run-pass/regions-infer-borrow-scope.rs1
-rw-r--r--src/test/run-pass/regions-infer-call-2.rs1
-rw-r--r--src/test/run-pass/regions-infer-call.rs1
-rw-r--r--src/test/run-pass/regions-infer-contravariance-due-to-ret.rs1
-rw-r--r--src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs1
-rw-r--r--src/test/run-pass/regions-no-variance-from-fn-generics.rs1
-rw-r--r--src/test/run-pass/regions-params.rs1
-rw-r--r--src/test/run-pass/regions-refcell.rs1
-rw-r--r--src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs1
-rw-r--r--src/test/run-pass/regions-return-interior-of-option.rs1
-rw-r--r--src/test/run-pass/regions-trait-object-1.rs1
-rw-r--r--src/test/run-pass/repeat-expr-in-static.rs1
-rw-r--r--src/test/run-pass/resolve-issue-2428.rs1
-rw-r--r--src/test/run-pass/resource-in-struct.rs1
-rw-r--r--src/test/run-pass/return-from-closure.rs1
-rw-r--r--src/test/run-pass/segfault-no-out-of-stack.rs1
-rw-r--r--src/test/run-pass/self-in-mut-slot-default-method.rs1
-rw-r--r--src/test/run-pass/self-in-mut-slot-immediate-value.rs1
-rw-r--r--src/test/run-pass/self-re-assign.rs1
-rw-r--r--src/test/run-pass/self-shadowing-import.rs1
-rw-r--r--src/test/run-pass/send_str_hashmap.rs1
-rw-r--r--src/test/run-pass/send_str_treemap.rs1
-rw-r--r--src/test/run-pass/sendfn-is-a-block.rs1
-rw-r--r--src/test/run-pass/sepcomp-cci.rs1
-rw-r--r--src/test/run-pass/sepcomp-extern.rs1
-rw-r--r--src/test/run-pass/sepcomp-fns-backwards.rs1
-rw-r--r--src/test/run-pass/sepcomp-fns.rs1
-rw-r--r--src/test/run-pass/sepcomp-lib.rs1
-rw-r--r--src/test/run-pass/sepcomp-statics.rs1
-rw-r--r--src/test/run-pass/sepcomp-unwind.rs1
-rw-r--r--src/test/run-pass/seq-compare.rs1
-rw-r--r--src/test/run-pass/shift-various-types.rs1
-rw-r--r--src/test/run-pass/shift.rs1
-rw-r--r--src/test/run-pass/signed-shift-const-eval.rs1
-rw-r--r--src/test/run-pass/sigpipe-should-be-ignored.rs1
-rw-r--r--src/test/run-pass/simd-binop.rs1
-rw-r--r--src/test/run-pass/simd-generics.rs1
-rw-r--r--src/test/run-pass/simd-size-align.rs1
-rw-r--r--src/test/run-pass/slice-2.rs1
-rw-r--r--src/test/run-pass/slice-panic-1.rs1
-rw-r--r--src/test/run-pass/slice-panic-2.rs1
-rw-r--r--src/test/run-pass/slice.rs1
-rw-r--r--src/test/run-pass/small-enum-range-edge.rs1
-rw-r--r--src/test/run-pass/spawn-types.rs1
-rw-r--r--src/test/run-pass/stable-addr-of.rs1
-rw-r--r--src/test/run-pass/static-function-pointer-xc.rs1
-rw-r--r--src/test/run-pass/static-function-pointer.rs1
-rw-r--r--src/test/run-pass/static-impl.rs1
-rw-r--r--src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs1
-rw-r--r--src/test/run-pass/static-method-xcrate.rs1
-rw-r--r--src/test/run-pass/static-methods-in-traits.rs1
-rw-r--r--src/test/run-pass/static-mut-foreign.rs1
-rw-r--r--src/test/run-pass/static-mut-xc.rs1
-rw-r--r--src/test/run-pass/str-multiline.rs1
-rw-r--r--src/test/run-pass/string-escapes.rs1
-rw-r--r--src/test/run-pass/struct-aliases-xcrate.rs1
-rw-r--r--src/test/run-pass/struct-aliases.rs1
-rw-r--r--src/test/run-pass/struct-destructuring-cross-crate.rs1
-rw-r--r--src/test/run-pass/struct-like-variant-match.rs1
-rw-r--r--src/test/run-pass/struct-new-as-field-name.rs1
-rw-r--r--src/test/run-pass/struct-order-of-eval-1.rs1
-rw-r--r--src/test/run-pass/struct-order-of-eval-2.rs1
-rw-r--r--src/test/run-pass/struct-order-of-eval-3.rs1
-rw-r--r--src/test/run-pass/struct-order-of-eval-4.rs1
-rw-r--r--src/test/run-pass/struct_variant_xc_match.rs1
-rw-r--r--src/test/run-pass/supertrait-default-generics.rs1
-rw-r--r--src/test/run-pass/swap-1.rs1
-rw-r--r--src/test/run-pass/swap-2.rs1
-rw-r--r--src/test/run-pass/syntax-extension-cfg.rs1
-rw-r--r--src/test/run-pass/tag-align-dyn-u64.rs1
-rw-r--r--src/test/run-pass/tag-align-dyn-variants.rs1
-rw-r--r--src/test/run-pass/tag-align-u64.rs1
-rw-r--r--src/test/run-pass/tag-variant-disr-val.rs1
-rw-r--r--src/test/run-pass/tag.rs1
-rw-r--r--src/test/run-pass/tail-direct.rs1
-rw-r--r--src/test/run-pass/task-comm-5.rs1
-rw-r--r--src/test/run-pass/task-comm-6.rs1
-rw-r--r--src/test/run-pass/task-comm-chan-nil.rs1
-rw-r--r--src/test/run-pass/terminate-in-initializer.rs1
-rw-r--r--src/test/run-pass/trait-bounds.rs1
-rw-r--r--src/test/run-pass/trait-default-method-bound-subst.rs1
-rw-r--r--src/test/run-pass/trait-default-method-bound-subst2.rs1
-rw-r--r--src/test/run-pass/trait-default-method-bound-subst3.rs1
-rw-r--r--src/test/run-pass/trait-default-method-bound-subst4.rs1
-rw-r--r--src/test/run-pass/trait-default-method-bound.rs1
-rw-r--r--src/test/run-pass/trait-default-method-xc-2.rs1
-rw-r--r--src/test/run-pass/trait-default-method-xc.rs1
-rw-r--r--src/test/run-pass/trait-generic.rs1
-rw-r--r--src/test/run-pass/trait-impl.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-auto-xc-2.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-auto-xc.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-auto.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-call-bound-inherited.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-call-bound-inherited2.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-cast.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-cross-trait-call.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-diamond.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-multiple-inheritors.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-multiple-params.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-overloading-xc-exe.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-self-in-supertype.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-simple.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-static.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-static2.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-subst.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-subst2.rs1
-rw-r--r--src/test/run-pass/trait-inheritance-visibility.rs1
-rw-r--r--src/test/run-pass/trait-inheritance2.rs1
-rw-r--r--src/test/run-pass/trait-object-generics.rs1
-rw-r--r--src/test/run-pass/trait-object-with-lifetime-bound.rs1
-rw-r--r--src/test/run-pass/trait-safety-ok-cc.rs1
-rw-r--r--src/test/run-pass/trait-safety-ok.rs1
-rw-r--r--src/test/run-pass/traits-assoc-type-in-supertrait.rs1
-rw-r--r--src/test/run-pass/traits-conditional-dispatch.rs1
-rw-r--r--src/test/run-pass/traits-conditional-model-fn.rs1
-rw-r--r--src/test/run-pass/traits-default-method-macro.rs1
-rw-r--r--src/test/run-pass/traits-multidispatch-infer-convert-target.rs1
-rw-r--r--src/test/run-pass/traits-repeated-supertrait.rs1
-rw-r--r--src/test/run-pass/trans-tag-static-padding.rs1
-rw-r--r--src/test/run-pass/tup.rs1
-rw-r--r--src/test/run-pass/tuple-index-fat-types.rs1
-rw-r--r--src/test/run-pass/tuple-index.rs1
-rw-r--r--src/test/run-pass/tydesc-name.rs1
-rw-r--r--src/test/run-pass/type-id-higher-rank.rs1
-rw-r--r--src/test/run-pass/type-namespace.rs1
-rw-r--r--src/test/run-pass/type-sizes.rs1
-rw-r--r--src/test/run-pass/typeck-macro-interaction-issue-8852.rs1
-rw-r--r--src/test/run-pass/typeck_type_placeholder_1.rs1
-rw-r--r--src/test/run-pass/typeid-intrinsic.rs1
-rw-r--r--src/test/run-pass/typestate-multi-decl.rs1
-rw-r--r--src/test/run-pass/u32-decr.rs1
-rw-r--r--src/test/run-pass/u8-incr-decr.rs1
-rw-r--r--src/test/run-pass/u8-incr.rs1
-rw-r--r--src/test/run-pass/ufcs-polymorphic-paths.rs1
-rw-r--r--src/test/run-pass/ufcs-trait-object.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-all-traits.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-blanket-fn-mut.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-blanket-fn.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-by-ref.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-call-fn-autoderef.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-counter-not-moved.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-cross-crate.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-drop.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-extern-fn-hr.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-extern-fn.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-fnmut-move.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-fnmut.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-fnonce-move.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-fnonce.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-kind.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-recursive-fn.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-infer-upvar.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-manual-impl.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-simple.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-single-word-env.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-sugar-object.rs1
-rw-r--r--src/test/run-pass/unboxed-closures-unique-type-id.rs1
-rw-r--r--src/test/run-pass/unfold-cross-crate.rs1
-rw-r--r--src/test/run-pass/uniq-self-in-mut-slot.rs1
-rw-r--r--src/test/run-pass/unique-assign-copy.rs1
-rw-r--r--src/test/run-pass/unique-assign-drop.rs1
-rw-r--r--src/test/run-pass/unique-assign-generic.rs1
-rw-r--r--src/test/run-pass/unique-assign.rs1
-rw-r--r--src/test/run-pass/unique-autoderef-field.rs1
-rw-r--r--src/test/run-pass/unique-autoderef-index.rs1
-rw-r--r--src/test/run-pass/unique-cmp.rs1
-rw-r--r--src/test/run-pass/unique-decl-init-copy.rs1
-rw-r--r--src/test/run-pass/unique-decl-init.rs1
-rw-r--r--src/test/run-pass/unique-decl-move.rs1
-rw-r--r--src/test/run-pass/unique-decl.rs1
-rw-r--r--src/test/run-pass/unique-deref.rs1
-rw-r--r--src/test/run-pass/unique-destructure.rs1
-rw-r--r--src/test/run-pass/unique-fn-arg-move.rs1
-rw-r--r--src/test/run-pass/unique-fn-arg-mut.rs1
-rw-r--r--src/test/run-pass/unique-fn-arg.rs1
-rw-r--r--src/test/run-pass/unique-fn-ret.rs1
-rw-r--r--src/test/run-pass/unique-in-vec-copy.rs1
-rw-r--r--src/test/run-pass/unique-in-vec.rs1
-rw-r--r--src/test/run-pass/unique-kinds.rs1
-rw-r--r--src/test/run-pass/unique-move-drop.rs1
-rw-r--r--src/test/run-pass/unique-move-temp.rs1
-rw-r--r--src/test/run-pass/unique-move.rs1
-rw-r--r--src/test/run-pass/unique-mutable.rs1
-rw-r--r--src/test/run-pass/unique-pat-2.rs1
-rw-r--r--src/test/run-pass/unique-pat.rs1
-rw-r--r--src/test/run-pass/unique-rec.rs1
-rw-r--r--src/test/run-pass/unique-send-2.rs1
-rw-r--r--src/test/run-pass/unique-send.rs1
-rw-r--r--src/test/run-pass/unique-swap.rs1
-rw-r--r--src/test/run-pass/unit-like-struct-drop-run.rs1
-rw-r--r--src/test/run-pass/unreachable-code-1.rs1
-rw-r--r--src/test/run-pass/unreachable-code.rs1
-rw-r--r--src/test/run-pass/unsafe-coercion.rs1
-rw-r--r--src/test/run-pass/unsafe-pointer-assignability.rs1
-rw-r--r--src/test/run-pass/unsized3.rs1
-rw-r--r--src/test/run-pass/unwind-unique.rs1
-rw-r--r--src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs1
-rw-r--r--src/test/run-pass/variance-vec-covariant.rs1
-rw-r--r--src/test/run-pass/vec-dst.rs1
-rw-r--r--src/test/run-pass/vec-fixed-length.rs1
-rw-r--r--src/test/run-pass/vec-growth.rs1
-rw-r--r--src/test/run-pass/vec-macro-repeat.rs1
-rw-r--r--src/test/run-pass/vec-macro-rvalue-scope.rs1
-rw-r--r--src/test/run-pass/vec-macro-with-trailing-comma.rs1
-rw-r--r--src/test/run-pass/vec-matching-autoslice.rs1
-rw-r--r--src/test/run-pass/vec-matching-fixed.rs1
-rw-r--r--src/test/run-pass/vec-matching-fold.rs1
-rw-r--r--src/test/run-pass/vec-matching.rs1
-rw-r--r--src/test/run-pass/vec-slice-drop.rs1
-rw-r--r--src/test/run-pass/vec-slice.rs1
-rw-r--r--src/test/run-pass/vec-tail-matching.rs1
-rw-r--r--src/test/run-pass/vec-to_str.rs1
-rw-r--r--src/test/run-pass/vec.rs1
-rw-r--r--src/test/run-pass/vector-sort-panic-safe.rs1
-rw-r--r--src/test/run-pass/wait-forked-but-failed-child.rs1
-rw-r--r--src/test/run-pass/where-for-self.rs1
-rw-r--r--src/test/run-pass/while-label.rs1
-rw-r--r--src/test/run-pass/while-let.rs1
-rw-r--r--src/test/run-pass/writealias.rs1
-rw-r--r--src/test/run-pass/xcrate-address-insignificant.rs1
-rw-r--r--src/test/run-pass/zero-size-type-destructors.rs1
-rw-r--r--src/test/run-pass/zero_sized_subslice_match.rs1
794 files changed, 1 insertions, 795 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index b3d1adb4421..3d10c151f80 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -37,6 +37,7 @@
 /// ```
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
+#[allow_internal_unstable]
 macro_rules! panic {
     () => ({
         panic!("explicit panic")
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs
index f71811b1ead..2f58a437eb4 100644
--- a/src/libstd/rt/unwind.rs
+++ b/src/libstd/rt/unwind.rs
@@ -495,7 +495,6 @@ pub extern fn rust_begin_unwind(msg: fmt::Arguments,
 /// on (e.g.) the inlining of other functions as possible), by moving
 /// the actual formatting into this shared place.
 #[inline(never)] #[cold]
-#[stable(since = "1.0.0", feature = "rust1")]
 pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, usize)) -> ! {
     use fmt::Write;
 
@@ -511,7 +510,6 @@ pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, usize))
 
 /// This is the entry point of unwinding for panic!() and assert!().
 #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible
-#[stable(since = "1.0.0", feature = "rust1")]
 pub fn begin_unwind<M: Any + Send>(msg: M, file_line: &(&'static str, usize)) -> ! {
     // Note that this should be the only allocation performed in this code path.
     // Currently this means that panic!() on OOM will invoke this code path,
@@ -598,7 +596,6 @@ fn begin_unwind_inner(msg: Box<Any + Send>,
 /// Only a limited number of callbacks can be registered, and this function
 /// returns whether the callback was successfully registered or not. It is not
 /// currently possible to unregister a callback once it has been registered.
-#[unstable(feature = "std_misc")]
 pub unsafe fn register(f: Callback) -> bool {
     match CALLBACK_CNT.fetch_add(1, Ordering::SeqCst) {
         // The invocation code has knowledge of this window where the count has
diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/run-pass-fulldeps/rename-directory.rs
index a1e016bf2ea..a0644e513a6 100644
--- a/src/test/run-pass-fulldeps/rename-directory.rs
+++ b/src/test/run-pass-fulldeps/rename-directory.rs
@@ -12,7 +12,6 @@
 // because it needs TempDir, which is in extra
 
 // ignore-android
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private, path_ext)]
 
diff --git a/src/test/run-pass/argument-passing.rs b/src/test/run-pass/argument-passing.rs
index 7101cfb5579..d2a595804a4 100644
--- a/src/test/run-pass/argument-passing.rs
+++ b/src/test/run-pass/argument-passing.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 struct X {
     x: isize
diff --git a/src/test/run-pass/arith-2.rs b/src/test/run-pass/arith-2.rs
index 0f4523c6818..c93049b87a7 100644
--- a/src/test/run-pass/arith-2.rs
+++ b/src/test/run-pass/arith-2.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let i32_c: isize = 0x10101010;
diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/run-pass/arith-unsigned.rs
index 8a0fc8adc18..e5ff97e3cdb 100644
--- a/src/test/run-pass/arith-unsigned.rs
+++ b/src/test/run-pass/arith-unsigned.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(type_limits)]
 
diff --git a/src/test/run-pass/artificial-block.rs b/src/test/run-pass/artificial-block.rs
index 3348a6754ee..53eec3c28c0 100644
--- a/src/test/run-pass/artificial-block.rs
+++ b/src/test/run-pass/artificial-block.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f() -> isize { { return 3; } }
 
diff --git a/src/test/run-pass/as-precedence.rs b/src/test/run-pass/as-precedence.rs
index 8e38128975b..d89607077dc 100644
--- a/src/test/run-pass/as-precedence.rs
+++ b/src/test/run-pass/as-precedence.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     assert_eq!(3 as usize * 3, 9);
diff --git a/src/test/run-pass/asm-in-out-operand.rs b/src/test/run-pass/asm-in-out-operand.rs
index 32924bcf744..3eebc7acb0f 100644
--- a/src/test/run-pass/asm-in-out-operand.rs
+++ b/src/test/run-pass/asm-in-out-operand.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(asm)]
 
diff --git a/src/test/run-pass/asm-out-assign.rs b/src/test/run-pass/asm-out-assign.rs
index 3cb7f6400da..d7913b473f8 100644
--- a/src/test/run-pass/asm-out-assign.rs
+++ b/src/test/run-pass/asm-out-assign.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(asm)]
 
diff --git a/src/test/run-pass/assign-assign.rs b/src/test/run-pass/assign-assign.rs
index 110f4720ceb..186f91da07c 100644
--- a/src/test/run-pass/assign-assign.rs
+++ b/src/test/run-pass/assign-assign.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // Issue 483 - Assignment expressions result in nil
-// pretty-expanded FIXME #23616
 
 fn test_assign() {
     let mut x: isize;
diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/run-pass/assignability-trait.rs
index 473f744a3ff..f05a1520b8e 100644
--- a/src/test/run-pass/assignability-trait.rs
+++ b/src/test/run-pass/assignability-trait.rs
@@ -12,7 +12,6 @@
 // making method calls, but only if there aren't any matches without
 // it.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/associated-types-basic.rs b/src/test/run-pass/associated-types-basic.rs
index d4ed2ee2d6e..06521e0ec78 100644
--- a/src/test/run-pass/associated-types-basic.rs
+++ b/src/test/run-pass/associated-types-basic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/associated-types-binding-in-trait.rs b/src/test/run-pass/associated-types-binding-in-trait.rs
index 39fc224148e..d82ba6add75 100644
--- a/src/test/run-pass/associated-types-binding-in-trait.rs
+++ b/src/test/run-pass/associated-types-binding-in-trait.rs
@@ -11,7 +11,6 @@
 // Test a case where the associated type binding (to `bool`, in this
 // case) is derived from the trait definition. Issue #21636.
 
-// pretty-expanded FIXME #23616
 
 use std::vec;
 
diff --git a/src/test/run-pass/associated-types-bound.rs b/src/test/run-pass/associated-types-bound.rs
index 2301821f663..4eacd120bc6 100644
--- a/src/test/run-pass/associated-types-bound.rs
+++ b/src/test/run-pass/associated-types-bound.rs
@@ -10,7 +10,6 @@
 
 // Test equality constrai32s on associated types in a where clause.
 
-// pretty-expanded FIXME #23616
 
 pub trait ToI32 {
     fn to_i32(&self) -> i32;
diff --git a/src/test/run-pass/associated-types-constant-type.rs b/src/test/run-pass/associated-types-constant-type.rs
index 5729fab475b..77ab616ca91 100644
--- a/src/test/run-pass/associated-types-constant-type.rs
+++ b/src/test/run-pass/associated-types-constant-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait SignedUnsigned {
     type Opposite;
diff --git a/src/test/run-pass/associated-types-doubleendediterator-object.rs b/src/test/run-pass/associated-types-doubleendediterator-object.rs
index 5dc289194ff..1661812520b 100644
--- a/src/test/run-pass/associated-types-doubleendediterator-object.rs
+++ b/src/test/run-pass/associated-types-doubleendediterator-object.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/associated-types-enum-field-named.rs b/src/test/run-pass/associated-types-enum-field-named.rs
index 8cf97fe62fe..7014cc59b71 100644
--- a/src/test/run-pass/associated-types-enum-field-named.rs
+++ b/src/test/run-pass/associated-types-enum-field-named.rs
@@ -10,7 +10,6 @@
 
 // Test associated types appearing in struct-like enum variants.
 
-// pretty-expanded FIXME #23616
 
 use self::VarValue::*;
 
diff --git a/src/test/run-pass/associated-types-enum-field-numbered.rs b/src/test/run-pass/associated-types-enum-field-numbered.rs
index 3c57da6b4a3..c983fdefc0e 100644
--- a/src/test/run-pass/associated-types-enum-field-numbered.rs
+++ b/src/test/run-pass/associated-types-enum-field-numbered.rs
@@ -10,7 +10,6 @@
 
 // Test associated types appearing in tuple-like enum variants.
 
-// pretty-expanded FIXME #23616
 
 use self::VarValue::*;
 
diff --git a/src/test/run-pass/associated-types-in-default-method.rs b/src/test/run-pass/associated-types-in-default-method.rs
index 2a1b9bdd2fa..74199f57fb6 100644
--- a/src/test/run-pass/associated-types-in-default-method.rs
+++ b/src/test/run-pass/associated-types-in-default-method.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Get {
     type Value;
diff --git a/src/test/run-pass/associated-types-in-fn.rs b/src/test/run-pass/associated-types-in-fn.rs
index 40b10fbfcac..dcd7895fa99 100644
--- a/src/test/run-pass/associated-types-in-fn.rs
+++ b/src/test/run-pass/associated-types-in-fn.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Get {
     type Value;
diff --git a/src/test/run-pass/associated-types-in-impl-generics.rs b/src/test/run-pass/associated-types-in-impl-generics.rs
index 99a9b7c23fe..5b81ac70908 100644
--- a/src/test/run-pass/associated-types-in-impl-generics.rs
+++ b/src/test/run-pass/associated-types-in-impl-generics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Get {
     type Value;
diff --git a/src/test/run-pass/associated-types-in-inherent-method.rs b/src/test/run-pass/associated-types-in-inherent-method.rs
index 0012d9d7596..5eaf4c2bc83 100644
--- a/src/test/run-pass/associated-types-in-inherent-method.rs
+++ b/src/test/run-pass/associated-types-in-inherent-method.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Get {
     type Value;
diff --git a/src/test/run-pass/associated-types-issue-20220.rs b/src/test/run-pass/associated-types-issue-20220.rs
index 718ea542799..31336787e4c 100644
--- a/src/test/run-pass/associated-types-issue-20220.rs
+++ b/src/test/run-pass/associated-types-issue-20220.rs
@@ -10,7 +10,6 @@
 
 // Test references to `Self::Item` in the trait. Issue #20220.
 
-// pretty-expanded FIXME #23616
 
 use std::vec;
 
diff --git a/src/test/run-pass/associated-types-issue-21212.rs b/src/test/run-pass/associated-types-issue-21212.rs
index 057677a0087..cf4b8272111 100644
--- a/src/test/run-pass/associated-types-issue-21212.rs
+++ b/src/test/run-pass/associated-types-issue-21212.rs
@@ -13,7 +13,6 @@
 // where clauses in the environment which in turn required normalizing
 // `Self::Input`.
 
-// pretty-expanded FIXME #23616
 
 pub trait Parser {
     type Input;
diff --git a/src/test/run-pass/associated-types-iterator-binding.rs b/src/test/run-pass/associated-types-iterator-binding.rs
index 24c5a3e9a83..181ce52eb4b 100644
--- a/src/test/run-pass/associated-types-iterator-binding.rs
+++ b/src/test/run-pass/associated-types-iterator-binding.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn pairwise_sub<T:DoubleEndedIterator<Item=isize>>(mut t: T) -> isize {
     let mut result = 0;
diff --git a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where-clause.rs b/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where-clause.rs
index 151a9da948e..dfd468884a1 100644
--- a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where-clause.rs
+++ b/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where-clause.rs
@@ -12,7 +12,6 @@
 // `Item` originates in a where-clause, not the declaration of
 // `T`. Issue #20300.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs b/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs
index 2518ccf1cb4..8054b3aa52a 100644
--- a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs
+++ b/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs
@@ -10,7 +10,6 @@
 
 // Test where the impl self type uses a projection from a constant type.
 
-// pretty-expanded FIXME #23616
 
 trait Int
 {
diff --git a/src/test/run-pass/associated-types-projection-in-supertrait.rs b/src/test/run-pass/associated-types-projection-in-supertrait.rs
index dbc2164c93a..70c7602ffce 100644
--- a/src/test/run-pass/associated-types-projection-in-supertrait.rs
+++ b/src/test/run-pass/associated-types-projection-in-supertrait.rs
@@ -11,7 +11,6 @@
 // Test that we are handle to correctly handle a projection type
 // that appears in a supertrait bound. Issue #20559.
 
-// pretty-expanded FIXME #23616
 
 trait A
 {
diff --git a/src/test/run-pass/associated-types-ref-in-struct-literal.rs b/src/test/run-pass/associated-types-ref-in-struct-literal.rs
index 945340008d8..3b7fb65a8b4 100644
--- a/src/test/run-pass/associated-types-ref-in-struct-literal.rs
+++ b/src/test/run-pass/associated-types-ref-in-struct-literal.rs
@@ -10,7 +10,6 @@
 
 // Test associated type references in a struct literal. Issue #20535.
 
-// pretty-expanded FIXME #23616
 
 pub trait Foo {
     type Bar;
diff --git a/src/test/run-pass/associated-types-return.rs b/src/test/run-pass/associated-types-return.rs
index f190e81d8a6..5bba54e57b4 100644
--- a/src/test/run-pass/associated-types-return.rs
+++ b/src/test/run-pass/associated-types-return.rs
@@ -10,7 +10,6 @@
 
 // Test equality constraints on associated types in a where clause.
 
-// pretty-expanded FIXME #23616
 
 pub trait Foo {
     type A;
diff --git a/src/test/run-pass/associated-types-simple.rs b/src/test/run-pass/associated-types-simple.rs
index 5a2761365bf..776b2183d39 100644
--- a/src/test/run-pass/associated-types-simple.rs
+++ b/src/test/run-pass/associated-types-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Get {
     type Value;
diff --git a/src/test/run-pass/associated-types-stream.rs b/src/test/run-pass/associated-types-stream.rs
index a2b7cf2106e..6adfaabcc23 100644
--- a/src/test/run-pass/associated-types-stream.rs
+++ b/src/test/run-pass/associated-types-stream.rs
@@ -11,7 +11,6 @@
 // Test references to the trait `Stream` in the bounds for associated
 // types defined on `Stream`. Issue #20551.
 
-// pretty-expanded FIXME #23616
 
 trait Stream {
     type Car;
diff --git a/src/test/run-pass/associated-types-struct-field-named.rs b/src/test/run-pass/associated-types-struct-field-named.rs
index d1872e4fb55..00746c32e1c 100644
--- a/src/test/run-pass/associated-types-struct-field-named.rs
+++ b/src/test/run-pass/associated-types-struct-field-named.rs
@@ -11,7 +11,6 @@
 // Test that we correctly normalize the type of a struct field
 // which has an associated type.
 
-// pretty-expanded FIXME #23616
 
 pub trait UnifyKey {
     type Value;
diff --git a/src/test/run-pass/associated-types-struct-field-numbered.rs b/src/test/run-pass/associated-types-struct-field-numbered.rs
index 3d97c503dca..25e89892a29 100644
--- a/src/test/run-pass/associated-types-struct-field-numbered.rs
+++ b/src/test/run-pass/associated-types-struct-field-numbered.rs
@@ -11,7 +11,6 @@
 // Test that we correctly normalize the type of a struct field
 // which has an associated type.
 
-// pretty-expanded FIXME #23616
 
 pub trait UnifyKey {
     type Value;
diff --git a/src/test/run-pass/associated-types-sugar-path.rs b/src/test/run-pass/associated-types-sugar-path.rs
index 353b49b49ce..1432369f714 100644
--- a/src/test/run-pass/associated-types-sugar-path.rs
+++ b/src/test/run-pass/associated-types-sugar-path.rs
@@ -10,7 +10,6 @@
 
 // Test paths to associated types using the type-parameter-only sugar.
 
-// pretty-expanded FIXME #23616
 
 pub trait Foo {
     type A;
diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/run-pass/attr-main-2.rs
index 4680f47fad6..b3c9ea541b7 100644
--- a/src/test/run-pass/attr-main-2.rs
+++ b/src/test/run-pass/attr-main-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(main)]
 
diff --git a/src/test/run-pass/attr-no-drop-flag-size.rs b/src/test/run-pass/attr-no-drop-flag-size.rs
index af8e4b7d4a1..893fb85b529 100644
--- a/src/test/run-pass/attr-no-drop-flag-size.rs
+++ b/src/test/run-pass/attr-no-drop-flag-size.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 #![feature(unsafe_no_drop_flag)]
diff --git a/src/test/run-pass/auto-loop.rs b/src/test/run-pass/auto-loop.rs
index 2e79183755a..babc0db4c31 100644
--- a/src/test/run-pass/auto-loop.rs
+++ b/src/test/run-pass/auto-loop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut sum = 0;
diff --git a/src/test/run-pass/auto-ref-sliceable.rs b/src/test/run-pass/auto-ref-sliceable.rs
index 6dab0e51971..5b12edb4275 100644
--- a/src/test/run-pass/auto-ref-sliceable.rs
+++ b/src/test/run-pass/auto-ref-sliceable.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait Pushable<T> {
     fn push_val(&mut self, t: T);
diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs
index 7d30b549ebe..1f3d17ad55c 100644
--- a/src/test/run-pass/autobind.rs
+++ b/src/test/run-pass/autobind.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn f<T>(x: Vec<T>) -> T { return x.into_iter().next().unwrap(); }
 
diff --git a/src/test/run-pass/autoderef-method-on-trait.rs b/src/test/run-pass/autoderef-method-on-trait.rs
index d7eee85f502..582fd020dd0 100644
--- a/src/test/run-pass/autoderef-method-on-trait.rs
+++ b/src/test/run-pass/autoderef-method-on-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/autoderef-method-priority.rs b/src/test/run-pass/autoderef-method-priority.rs
index 6c52035b708..c80a92a185a 100644
--- a/src/test/run-pass/autoderef-method-priority.rs
+++ b/src/test/run-pass/autoderef-method-priority.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs b/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs
index 809ab0a3521..2a782cfa176 100644
--- a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs
+++ b/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/autoderef-method-twice.rs b/src/test/run-pass/autoderef-method-twice.rs
index 9c7828c8938..a1bcf65ab75 100644
--- a/src/test/run-pass/autoderef-method-twice.rs
+++ b/src/test/run-pass/autoderef-method-twice.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/autoderef-method.rs b/src/test/run-pass/autoderef-method.rs
index e63dd07eb07..326218674ae 100644
--- a/src/test/run-pass/autoderef-method.rs
+++ b/src/test/run-pass/autoderef-method.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs b/src/test/run-pass/autoref-intermediate-types-issue-3585.rs
index 0f935776fc5..05f12fd089a 100644
--- a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs
+++ b/src/test/run-pass/autoref-intermediate-types-issue-3585.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/big-literals.rs b/src/test/run-pass/big-literals.rs
index ab9d892ce2b..19c0e7baaa0 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/run-pass/big-literals.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/run-pass/binary-minus-without-space.rs
index 1fe9dde844a..01a9ec80939 100644
--- a/src/test/run-pass/binary-minus-without-space.rs
+++ b/src/test/run-pass/binary-minus-without-space.rs
@@ -10,7 +10,6 @@
 
 // Check that issue #954 stays fixed
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match -1 { -1 => {}, _ => panic!("wat") }
diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs
index 5a6e801501f..9be7d63ab95 100644
--- a/src/test/run-pass/bind-by-move.rs
+++ b/src/test/run-pass/bind-by-move.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::Arc;
 fn dispose(_x: Arc<bool>) { }
diff --git a/src/test/run-pass/bind-field-short-with-modifiers.rs b/src/test/run-pass/bind-field-short-with-modifiers.rs
index e61ff61a216..b4c38bf450b 100644
--- a/src/test/run-pass/bind-field-short-with-modifiers.rs
+++ b/src/test/run-pass/bind-field-short-with-modifiers.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     struct Foo { x: isize, y: isize }
diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs
index 5944438e20d..73cba2e4e0a 100644
--- a/src/test/run-pass/block-arg-call-as.rs
+++ b/src/test/run-pass/block-arg-call-as.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn asBlock<F>(f: F) -> usize where F: FnOnce() -> usize {
    return f();
diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/run-pass/block-expr-precedence.rs
index 01bd8ce10cd..ac8f5012573 100644
--- a/src/test/run-pass/block-expr-precedence.rs
+++ b/src/test/run-pass/block-expr-precedence.rs
@@ -13,7 +13,6 @@
 
 // no-reformat
 
-// pretty-expanded FIXME #23616
 
 /*
  *
diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/run-pass/block-fn-coerce.rs
index 0addd33c1e4..3e6109da39a 100644
--- a/src/test/run-pass/block-fn-coerce.rs
+++ b/src/test/run-pass/block-fn-coerce.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn force<F>(f: F) -> isize where F: FnOnce() -> isize { return f(); }
 
diff --git a/src/test/run-pass/bool-not.rs b/src/test/run-pass/bool-not.rs
index c46684af6ef..fa0b86d0a02 100644
--- a/src/test/run-pass/bool-not.rs
+++ b/src/test/run-pass/bool-not.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     if !false { assert!((true)); } else { assert!((false)); }
diff --git a/src/test/run-pass/bool.rs b/src/test/run-pass/bool.rs
index a2b19d32054..53b568b06b5 100644
--- a/src/test/run-pass/bool.rs
+++ b/src/test/run-pass/bool.rs
@@ -10,7 +10,6 @@
 
 // Basic boolean tests
 
-// pretty-expanded FIXME #23616
 
 use std::cmp::Ordering::{Equal, Greater, Less};
 use std::ops::{BitAnd, BitOr, BitXor};
diff --git a/src/test/run-pass/borrow-tuple-fields.rs b/src/test/run-pass/borrow-tuple-fields.rs
index 7cf61bd569d..f0d09688192 100644
--- a/src/test/run-pass/borrow-tuple-fields.rs
+++ b/src/test/run-pass/borrow-tuple-fields.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo(isize, isize);
 
diff --git a/src/test/run-pass/borrowck-borrow-from-expr-block.rs b/src/test/run-pass/borrowck-borrow-from-expr-block.rs
index 24c7285b1fb..7fdc65a96e2 100644
--- a/src/test/run-pass/borrowck-borrow-from-expr-block.rs
+++ b/src/test/run-pass/borrowck-borrow-from-expr-block.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/borrowck-closures-two-imm.rs b/src/test/run-pass/borrowck-closures-two-imm.rs
index 6ccb2203bca..5b15c8f0797 100644
--- a/src/test/run-pass/borrowck-closures-two-imm.rs
+++ b/src/test/run-pass/borrowck-closures-two-imm.rs
@@ -14,7 +14,6 @@
 // that the main function can read the variable too while
 // the closures are in scope. Issue #6801.
 
-// pretty-expanded FIXME #23616
 
 fn a() -> i32 {
     let mut x = 3;
diff --git a/src/test/run-pass/borrowck-fixed-length-vecs.rs b/src/test/run-pass/borrowck-fixed-length-vecs.rs
index 3f38a8df04c..0e33351894d 100644
--- a/src/test/run-pass/borrowck-fixed-length-vecs.rs
+++ b/src/test/run-pass/borrowck-fixed-length-vecs.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = [22];
diff --git a/src/test/run-pass/borrowck-freeze-frozen-mut.rs b/src/test/run-pass/borrowck-freeze-frozen-mut.rs
index eaa78553d85..380bd398a7c 100644
--- a/src/test/run-pass/borrowck-freeze-frozen-mut.rs
+++ b/src/test/run-pass/borrowck-freeze-frozen-mut.rs
@@ -10,7 +10,6 @@
 
 // Test that a `&mut` inside of an `&` is freezable.
 
-// pretty-expanded FIXME #23616
 
 struct MutSlice<'a, T:'a> {
     data: &'a mut [T]
diff --git a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs
index b40504f37d4..fb30c85e709 100644
--- a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs
+++ b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs
@@ -11,7 +11,6 @@
 // Check that we do not ICE when compiling this
 // macro, which reuses the expression `$id`
 
-// pretty-expanded FIXME #23616
 
 #![feature(box_patterns)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/borrowck-move-by-capture-ok.rs b/src/test/run-pass/borrowck-move-by-capture-ok.rs
index 7c03c6a9a48..bbc668f5cab 100644
--- a/src/test/run-pass/borrowck-move-by-capture-ok.rs
+++ b/src/test/run-pass/borrowck-move-by-capture-ok.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs
index 4d37bcb5a48..d55517c65d6 100644
--- a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs
+++ b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn want_slice(v: &[isize]) -> isize {
     let mut sum = 0;
diff --git a/src/test/run-pass/borrowck-pat-reassign-no-binding.rs b/src/test/run-pass/borrowck-pat-reassign-no-binding.rs
index c3b69333dc5..e0a5db678d2 100644
--- a/src/test/run-pass/borrowck-pat-reassign-no-binding.rs
+++ b/src/test/run-pass/borrowck-pat-reassign-no-binding.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut x = None;
diff --git a/src/test/run-pass/borrowck-rvalues-mutable.rs b/src/test/run-pass/borrowck-rvalues-mutable.rs
index 1b20f6c7061..045e8d952ad 100644
--- a/src/test/run-pass/borrowck-rvalues-mutable.rs
+++ b/src/test/run-pass/borrowck-rvalues-mutable.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Counter {
     value: usize
diff --git a/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs b/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs
index 36a84a62d48..59a5fea769a 100644
--- a/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs
+++ b/src/test/run-pass/borrowck-scope-of-deref-issue-4666.rs
@@ -12,7 +12,6 @@
 // limited to the deref operation itself, and does not infect the
 // block as a whole.
 
-// pretty-expanded FIXME #23616
 
 struct Box {
     x: usize
diff --git a/src/test/run-pass/borrowck-univariant-enum.rs b/src/test/run-pass/borrowck-univariant-enum.rs
index a5c68c5ecf9..2e8ddb08064 100644
--- a/src/test/run-pass/borrowck-univariant-enum.rs
+++ b/src/test/run-pass/borrowck-univariant-enum.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/borrowed-ptr-pattern-2.rs b/src/test/run-pass/borrowed-ptr-pattern-2.rs
index aaf962577ff..3e47764ba02 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-2.rs
+++ b/src/test/run-pass/borrowed-ptr-pattern-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo(s: &String) -> bool {
     match &**s {
diff --git a/src/test/run-pass/borrowed-ptr-pattern-3.rs b/src/test/run-pass/borrowed-ptr-pattern-3.rs
index c8cc29b9bda..91228efb9c1 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-3.rs
+++ b/src/test/run-pass/borrowed-ptr-pattern-3.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo<'r>(s: &'r usize) -> bool {
     match s {
diff --git a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs
index 69cb27dcf89..6656eb41f2e 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs
+++ b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let (&x, &y) = (&3, &'a');
diff --git a/src/test/run-pass/borrowed-ptr-pattern-option.rs b/src/test/run-pass/borrowed-ptr-pattern-option.rs
index 14b6c32a11e..e1e9381eeb8 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-option.rs
+++ b/src/test/run-pass/borrowed-ptr-pattern-option.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn select<'r>(x: &'r Option<isize>, y: &'r Option<isize>) -> &'r Option<isize> {
     match (x, y) {
diff --git a/src/test/run-pass/borrowed-ptr-pattern.rs b/src/test/run-pass/borrowed-ptr-pattern.rs
index 52322c41236..3042ff7743b 100644
--- a/src/test/run-pass/borrowed-ptr-pattern.rs
+++ b/src/test/run-pass/borrowed-ptr-pattern.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo<T:Clone>(x: &T) -> T{
     match x {
diff --git a/src/test/run-pass/break.rs b/src/test/run-pass/break.rs
index 80934c48515..ea136e2dc48 100644
--- a/src/test/run-pass/break.rs
+++ b/src/test/run-pass/break.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut i = 0;
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/run-pass/bug-7183-generics.rs
index 5467ed10e98..80fd09114fc 100644
--- a/src/test/run-pass/bug-7183-generics.rs
+++ b/src/test/run-pass/bug-7183-generics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Speak : Sized {
     fn say(&self, s:&str) -> String;
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
index eb6d1028331..c5064d56ca1 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
@@ -14,7 +14,6 @@
 // a Send. Basically this just makes sure rustc is using
 // each_bound_trait_and_supertraits in type_contents correctly.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::{channel, Sender};
 
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
index 082f5944fd3..183e6fe232c 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
@@ -14,7 +14,6 @@
 // Tests "capabilities" granted by traits with super-builtin-kinds,
 // even when using them cross-crate.
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_superkinds_in_metadata;
 
diff --git a/src/test/run-pass/builtin-superkinds-capabilities.rs b/src/test/run-pass/builtin-superkinds-capabilities.rs
index 594fb5ec707..a4d5c943b1f 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities.rs
+++ b/src/test/run-pass/builtin-superkinds-capabilities.rs
@@ -12,7 +12,6 @@
 // builtin-kinds, e.g., if a trait requires Send to implement, then
 // at usage site of that trait, we know we have the Send capability.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::{channel, Sender, Receiver};
 
diff --git a/src/test/run-pass/builtin-superkinds-self-type.rs b/src/test/run-pass/builtin-superkinds-self-type.rs
index 924a8c023f8..c4dc7d78b06 100644
--- a/src/test/run-pass/builtin-superkinds-self-type.rs
+++ b/src/test/run-pass/builtin-superkinds-self-type.rs
@@ -11,7 +11,6 @@
 // Tests the ability for the Self type in default methods to use
 // capabilities granted by builtin kinds as supertraits.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::{Sender, channel};
 
diff --git a/src/test/run-pass/by-value-self-in-mut-slot.rs b/src/test/run-pass/by-value-self-in-mut-slot.rs
index 464c24fc8b0..5bbdec95b15 100644
--- a/src/test/run-pass/by-value-self-in-mut-slot.rs
+++ b/src/test/run-pass/by-value-self-in-mut-slot.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct X {
     a: isize
diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/run-pass/call-closure-from-overloaded-op.rs
index e3ee282ec2a..e35398a2291 100644
--- a/src/test/run-pass/call-closure-from-overloaded-op.rs
+++ b/src/test/run-pass/call-closure-from-overloaded-op.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo() -> isize { 22 }
 
diff --git a/src/test/run-pass/capture-clauses-boxed-closures.rs b/src/test/run-pass/capture-clauses-boxed-closures.rs
index 5bf6f5fb048..45cec79e1a3 100644
--- a/src/test/run-pass/capture-clauses-boxed-closures.rs
+++ b/src/test/run-pass/capture-clauses-boxed-closures.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn each<T, F>(x: &[T], mut f: F) where F: FnMut(&T) {
     for val in x {
diff --git a/src/test/run-pass/capture-clauses-unboxed-closures.rs b/src/test/run-pass/capture-clauses-unboxed-closures.rs
index 448ed76fe96..5e7d5aacb8d 100644
--- a/src/test/run-pass/capture-clauses-unboxed-closures.rs
+++ b/src/test/run-pass/capture-clauses-unboxed-closures.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/cast.rs b/src/test/run-pass/cast.rs
index 03a73555f85..bb60626a4bf 100644
--- a/src/test/run-pass/cast.rs
+++ b/src/test/run-pass/cast.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let i: isize = 'Q' as isize;
diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/run-pass/cci_nested_exe.rs
index 66546988304..e4f4a4f3a57 100644
--- a/src/test/run-pass/cci_nested_exe.rs
+++ b/src/test/run-pass/cci_nested_exe.rs
@@ -10,7 +10,6 @@
 
 // aux-build:cci_nested_lib.rs
 
-// pretty-expanded FIXME #23616
 
 #![feature(globs)]
 
diff --git a/src/test/run-pass/cell-does-not-clone.rs b/src/test/run-pass/cell-does-not-clone.rs
index c87a3e8bb93..c1fcf496546 100644
--- a/src/test/run-pass/cell-does-not-clone.rs
+++ b/src/test/run-pass/cell-does-not-clone.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/cfg-macros-foo.rs b/src/test/run-pass/cfg-macros-foo.rs
index 5fa1bc47f87..36b9ce1585c 100644
--- a/src/test/run-pass/cfg-macros-foo.rs
+++ b/src/test/run-pass/cfg-macros-foo.rs
@@ -13,7 +13,6 @@
 // check that cfg correctly chooses between the macro impls (see also
 // cfg-macros-notfoo.rs)
 
-// pretty-expanded FIXME #23616
 
 #[cfg(foo)]
 #[macro_use]
diff --git a/src/test/run-pass/cfg-macros-notfoo.rs b/src/test/run-pass/cfg-macros-notfoo.rs
index 7cddac16031..4e1b833add0 100644
--- a/src/test/run-pass/cfg-macros-notfoo.rs
+++ b/src/test/run-pass/cfg-macros-notfoo.rs
@@ -13,7 +13,6 @@
 // check that cfg correctly chooses between the macro impls (see also
 // cfg-macros-foo.rs)
 
-// pretty-expanded FIXME #23616
 
 #[cfg(foo)]
 #[macro_use]
diff --git a/src/test/run-pass/cfgs-on-items.rs b/src/test/run-pass/cfgs-on-items.rs
index 5c22d5c8690..1b692d8bd51 100644
--- a/src/test/run-pass/cfgs-on-items.rs
+++ b/src/test/run-pass/cfgs-on-items.rs
@@ -11,7 +11,6 @@
 // compile-flags: --cfg fooA --cfg fooB
 
 // fooA AND !bar
-// pretty-expanded FIXME #23616
 
 #[cfg(all(fooA, not(bar)))]
 fn foo1() -> isize { 1 }
diff --git a/src/test/run-pass/char.rs b/src/test/run-pass/char.rs
index 801b01918e1..d63512f8066 100644
--- a/src/test/run-pass/char.rs
+++ b/src/test/run-pass/char.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let c: char = 'x';
diff --git a/src/test/run-pass/check-static-mut-slices.rs b/src/test/run-pass/check-static-mut-slices.rs
index 19c3458ef7b..5959dd4c389 100644
--- a/src/test/run-pass/check-static-mut-slices.rs
+++ b/src/test/run-pass/check-static-mut-slices.rs
@@ -10,7 +10,6 @@
 
 // Checks that mutable static items can have mutable slices
 
-// pretty-expanded FIXME #23616
 
 static mut TEST: &'static mut [isize] = &mut [1];
 
diff --git a/src/test/run-pass/check-static-slice.rs b/src/test/run-pass/check-static-slice.rs
index 8a7ae1de9bc..8408597f354 100644
--- a/src/test/run-pass/check-static-slice.rs
+++ b/src/test/run-pass/check-static-slice.rs
@@ -11,7 +11,6 @@
 // Check that the various ways of getting to a reference to a vec (both sized
 // and unsized) work properly.
 
-// pretty-expanded FIXME #23616
 
 const aa: [isize; 3] = [1, 2, 3];
 const ab: &'static [isize; 3] = &aa;
diff --git a/src/test/run-pass/class-exports.rs b/src/test/run-pass/class-exports.rs
index 675acf1dd62..6783609b256 100644
--- a/src/test/run-pass/class-exports.rs
+++ b/src/test/run-pass/class-exports.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 /* Test that exporting a class also exports its
    public fields and methods */
diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/run-pass/class-method-cross-crate.rs
index a5c60e3a7b5..6ab158dc37c 100644
--- a/src/test/run-pass/class-method-cross-crate.rs
+++ b/src/test/run-pass/class-method-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_class_2.rs
-// pretty-expanded FIXME #23616
 
 extern crate cci_class_2;
 use cci_class_2::kitties::cat;
diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/run-pass/class-methods-cross-crate.rs
index 73abaf7d34b..66657100759 100644
--- a/src/test/run-pass/class-methods-cross-crate.rs
+++ b/src/test/run-pass/class-methods-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_class_3.rs
-// pretty-expanded FIXME #23616
 
 extern crate cci_class_3;
 use cci_class_3::kitties::cat;
diff --git a/src/test/run-pass/class-methods.rs b/src/test/run-pass/class-methods.rs
index d454bdd73a1..93af906bd5a 100644
--- a/src/test/run-pass/class-methods.rs
+++ b/src/test/run-pass/class-methods.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct cat {
   meows : usize,
diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs
index 6537a931fa6..4d247bde190 100644
--- a/src/test/run-pass/class-poly-methods-cross-crate.rs
+++ b/src/test/run-pass/class-poly-methods-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_class_6.rs
-// pretty-expanded FIXME #23616
 
 extern crate cci_class_6;
 use cci_class_6::kitties::cat;
diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs
index 27f872d532c..2528ff5128f 100644
--- a/src/test/run-pass/class-poly-methods.rs
+++ b/src/test/run-pass/class-poly-methods.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 struct cat<U> {
     info : Vec<U> ,
diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/run-pass/classes-cross-crate.rs
index 36d7bd6b3ca..3d99aa1ef1d 100644
--- a/src/test/run-pass/classes-cross-crate.rs
+++ b/src/test/run-pass/classes-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_class_4.rs
-// pretty-expanded FIXME #23616
 
 extern crate cci_class_4;
 use cci_class_4::kitties::cat;
diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/run-pass/classes-simple-cross-crate.rs
index cfa13dbe622..db15001c62f 100644
--- a/src/test/run-pass/classes-simple-cross-crate.rs
+++ b/src/test/run-pass/classes-simple-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:cci_class.rs
-// pretty-expanded FIXME #23616
 
 extern crate cci_class;
 use cci_class::kitties::cat;
diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/run-pass/classes-simple-method.rs
index 0d9f859d2d1..64ec2ea7e71 100644
--- a/src/test/run-pass/classes-simple-method.rs
+++ b/src/test/run-pass/classes-simple-method.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct cat {
     meows : usize,
diff --git a/src/test/run-pass/classes-simple.rs b/src/test/run-pass/classes-simple.rs
index f520623a75a..c475fb2cff9 100644
--- a/src/test/run-pass/classes-simple.rs
+++ b/src/test/run-pass/classes-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct cat {
     meows : usize,
diff --git a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs b/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
index 1d0030fd3d3..d813a6d8102 100644
--- a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
+++ b/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
@@ -12,7 +12,6 @@
 // This test verifies that temporaries created for `while`'s and `if`
 // conditions are dropped after the condition is evaluated.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
index 3b5421e5aff..344ea63c7c7 100644
--- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
+++ b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
@@ -24,7 +24,6 @@
 // It's unclear how likely such a bug is to recur, but it seems like a
 // scenario worth testing.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/closure-inference.rs b/src/test/run-pass/closure-inference.rs
index 06b6e1b5abe..630a510ca65 100644
--- a/src/test/run-pass/closure-inference.rs
+++ b/src/test/run-pass/closure-inference.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn foo(i: isize) -> isize { i + 1 }
 
diff --git a/src/test/run-pass/closure-inference2.rs b/src/test/run-pass/closure-inference2.rs
index 328a27b3f1e..2f24cd4ce40 100644
--- a/src/test/run-pass/closure-inference2.rs
+++ b/src/test/run-pass/closure-inference2.rs
@@ -10,7 +10,6 @@
 
 // Test a rather underspecified example:
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let f = {|i| i};
diff --git a/src/test/run-pass/cmp-default.rs b/src/test/run-pass/cmp-default.rs
index 2b7557c7bc5..cd3f556864e 100644
--- a/src/test/run-pass/cmp-default.rs
+++ b/src/test/run-pass/cmp-default.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::cmp::Ordering;
 
diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs
index 6000b358acf..5258ad1af51 100644
--- a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs
+++ b/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct SpeechMaker {
     speeches: usize
diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs
index 2e41ff3a560..4e116ae1466 100644
--- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs
+++ b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn bar(v: &mut [usize]) -> Vec<usize> {
     v.to_vec()
diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs
index 803f86e0fb1..ce0bc33905f 100644
--- a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs
+++ b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn reverse(v: &mut [usize]) {
     v.reverse();
diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs
index a5fac127356..066b33e007b 100644
--- a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs
+++ b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn bar(v: &mut [usize]) {
     v.reverse();
diff --git a/src/test/run-pass/compare-generic-enums.rs b/src/test/run-pass/compare-generic-enums.rs
index 69945584876..228a73326e1 100644
--- a/src/test/run-pass/compare-generic-enums.rs
+++ b/src/test/run-pass/compare-generic-enums.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 type an_int = isize;
 
diff --git a/src/test/run-pass/concat.rs b/src/test/run-pass/concat.rs
index 7441d1f21b0..9a2390a9e68 100644
--- a/src/test/run-pass/concat.rs
+++ b/src/test/run-pass/concat.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string());
diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs
index e6660bb9ae8..5891d9f1aa0 100644
--- a/src/test/run-pass/conditional-compile.rs
+++ b/src/test/run-pass/conditional-compile.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // Crate use statements
-// pretty-expanded FIXME #23616
 
 #[cfg(bogus)]
 use flippity;
diff --git a/src/test/run-pass/conditional-debug-macro-off.rs b/src/test/run-pass/conditional-debug-macro-off.rs
index 192e647f5cb..c6beb5ba358 100644
--- a/src/test/run-pass/conditional-debug-macro-off.rs
+++ b/src/test/run-pass/conditional-debug-macro-off.rs
@@ -11,7 +11,6 @@
 // compile-flags: -C debug-assertions=no
 // exec-env:RUST_LOG=conditional-debug-macro-off=4
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/const-autoderef.rs b/src/test/run-pass/const-autoderef.rs
index 1349b7f814b..69173e35e2c 100644
--- a/src/test/run-pass/const-autoderef.rs
+++ b/src/test/run-pass/const-autoderef.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static A: [u8; 1] = ['h' as u8];
 static B: u8 = (&A)[0];
diff --git a/src/test/run-pass/const-big-enum.rs b/src/test/run-pass/const-big-enum.rs
index 158c695c548..125aefe036d 100644
--- a/src/test/run-pass/const-big-enum.rs
+++ b/src/test/run-pass/const-big-enum.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     Bar(u32),
diff --git a/src/test/run-pass/const-binops.rs b/src/test/run-pass/const-binops.rs
index 1a95220cda5..4b32ee35231 100644
--- a/src/test/run-pass/const-binops.rs
+++ b/src/test/run-pass/const-binops.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => ({
diff --git a/src/test/run-pass/const-block-cross-crate-fn.rs b/src/test/run-pass/const-block-cross-crate-fn.rs
index 853e8dc62bb..6fa6feffbfa 100644
--- a/src/test/run-pass/const-block-cross-crate-fn.rs
+++ b/src/test/run-pass/const-block-cross-crate-fn.rs
@@ -10,7 +10,6 @@
 
 // aux-build:cci_const_block.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate cci_const_block;
 
diff --git a/src/test/run-pass/const-block-item-macro-codegen.rs b/src/test/run-pass/const-block-item-macro-codegen.rs
index b9e8dbf41d7..8a4b220a376 100644
--- a/src/test/run-pass/const-block-item-macro-codegen.rs
+++ b/src/test/run-pass/const-block-item-macro-codegen.rs
@@ -11,7 +11,6 @@
 // General test that function items in static blocks
 // can be generated with a macro.
 
-// pretty-expanded FIXME #23616
 
 struct MyType {
     desc: &'static str,
diff --git a/src/test/run-pass/const-block-item.rs b/src/test/run-pass/const-block-item.rs
index 897e5382261..b616b1f6103 100644
--- a/src/test/run-pass/const-block-item.rs
+++ b/src/test/run-pass/const-block-item.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod foo {
     pub trait Value {
diff --git a/src/test/run-pass/const-block.rs b/src/test/run-pass/const-block.rs
index 1337a91fe05..e56d01d7ba8 100644
--- a/src/test/run-pass/const-block.rs
+++ b/src/test/run-pass/const-block.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
 #![allow(unused_unsafe)]
diff --git a/src/test/run-pass/const-cast-ptr-int.rs b/src/test/run-pass/const-cast-ptr-int.rs
index bbe3020ea1c..e7674f893d3 100644
--- a/src/test/run-pass/const-cast-ptr-int.rs
+++ b/src/test/run-pass/const-cast-ptr-int.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::ptr;
 
diff --git a/src/test/run-pass/const-cast.rs b/src/test/run-pass/const-cast.rs
index f660dc5fa45..411df2b3e07 100644
--- a/src/test/run-pass/const-cast.rs
+++ b/src/test/run-pass/const-cast.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(libc)]
 
diff --git a/src/test/run-pass/const-const.rs b/src/test/run-pass/const-const.rs
index d75a5a7eb1c..b28017b85ad 100644
--- a/src/test/run-pass/const-const.rs
+++ b/src/test/run-pass/const-const.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const a: isize = 1;
 const b: isize = a + 2;
diff --git a/src/test/run-pass/const-contents.rs b/src/test/run-pass/const-contents.rs
index 2dfb88dee0b..0d9d0e0e0aa 100644
--- a/src/test/run-pass/const-contents.rs
+++ b/src/test/run-pass/const-contents.rs
@@ -10,7 +10,6 @@
 
 // Issue #570
 
-// pretty-expanded FIXME #23616
 
 static lsl : isize = 1 << 2;
 static add : isize = 1 + 2;
diff --git a/src/test/run-pass/const-cross-crate-const.rs b/src/test/run-pass/const-cross-crate-const.rs
index e36a55361ec..d66c335db2e 100644
--- a/src/test/run-pass/const-cross-crate-const.rs
+++ b/src/test/run-pass/const-cross-crate-const.rs
@@ -10,7 +10,6 @@
 
 // aux-build:cci_const.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate cci_const;
 static foo: &'static str = cci_const::foopy;
diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs
index 98f42f91245..bbe31ceed33 100644
--- a/src/test/run-pass/const-cross-crate-extern.rs
+++ b/src/test/run-pass/const-cross-crate-extern.rs
@@ -10,7 +10,6 @@
 
 // aux-build:cci_const.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate cci_const;
 use cci_const::bar;
diff --git a/src/test/run-pass/const-deref.rs b/src/test/run-pass/const-deref.rs
index 1648332fe2c..f5407f0c815 100644
--- a/src/test/run-pass/const-deref.rs
+++ b/src/test/run-pass/const-deref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const C: &'static isize = &1000;
 static D: isize = *C;
diff --git a/src/test/run-pass/const-enum-byref-self.rs b/src/test/run-pass/const-enum-byref-self.rs
index e99e1aac8af..57470c4a67e 100644
--- a/src/test/run-pass/const-enum-byref-self.rs
+++ b/src/test/run-pass/const-enum-byref-self.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V, VV(isize) }
 static C: E = E::V;
diff --git a/src/test/run-pass/const-enum-byref.rs b/src/test/run-pass/const-enum-byref.rs
index 4905eaace68..e3f1d5d3532 100644
--- a/src/test/run-pass/const-enum-byref.rs
+++ b/src/test/run-pass/const-enum-byref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V, VV(isize) }
 static C: E = E::V;
diff --git a/src/test/run-pass/const-enum-cast.rs b/src/test/run-pass/const-enum-cast.rs
index 3d73933c6f6..38f21f7e959 100644
--- a/src/test/run-pass/const-enum-cast.rs
+++ b/src/test/run-pass/const-enum-cast.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum A { A1, A2 }
 enum B { B1=0, B2=2 }
diff --git a/src/test/run-pass/const-enum-ptr.rs b/src/test/run-pass/const-enum-ptr.rs
index d34b5381df9..40a1c99e987 100644
--- a/src/test/run-pass/const-enum-ptr.rs
+++ b/src/test/run-pass/const-enum-ptr.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V0, V1(isize) }
 static C: &'static E = &E::V0;
diff --git a/src/test/run-pass/const-enum-struct.rs b/src/test/run-pass/const-enum-struct.rs
index 71a9703ec31..46c4f82eb98 100644
--- a/src/test/run-pass/const-enum-struct.rs
+++ b/src/test/run-pass/const-enum-struct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V16(u16), V32(u32) }
 struct S { a: E, b: u16, c: u16 }
diff --git a/src/test/run-pass/const-enum-struct2.rs b/src/test/run-pass/const-enum-struct2.rs
index ca56cb5b01a..e356ecb385b 100644
--- a/src/test/run-pass/const-enum-struct2.rs
+++ b/src/test/run-pass/const-enum-struct2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V0, V16(u16) }
 struct S { a: E, b: u16, c: u16 }
diff --git a/src/test/run-pass/const-enum-structlike.rs b/src/test/run-pass/const-enum-structlike.rs
index 113f20e21e1..6c8786dee67 100644
--- a/src/test/run-pass/const-enum-structlike.rs
+++ b/src/test/run-pass/const-enum-structlike.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E {
     S0 { s: String },
diff --git a/src/test/run-pass/const-enum-tuple.rs b/src/test/run-pass/const-enum-tuple.rs
index 2ab28f5fb23..476defaa524 100644
--- a/src/test/run-pass/const-enum-tuple.rs
+++ b/src/test/run-pass/const-enum-tuple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V16(u16), V32(u32) }
 static C: (E, u16, u16) = (E::V16(0xDEAD), 0x600D, 0xBAD);
diff --git a/src/test/run-pass/const-enum-tuple2.rs b/src/test/run-pass/const-enum-tuple2.rs
index fe1b2e051c4..61043ef75a4 100644
--- a/src/test/run-pass/const-enum-tuple2.rs
+++ b/src/test/run-pass/const-enum-tuple2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V0, V16(u16) }
 static C: (E, u16, u16) = (E::V0, 0x600D, 0xBAD);
diff --git a/src/test/run-pass/const-enum-tuplestruct.rs b/src/test/run-pass/const-enum-tuplestruct.rs
index 7f9de49404d..f574508522b 100644
--- a/src/test/run-pass/const-enum-tuplestruct.rs
+++ b/src/test/run-pass/const-enum-tuplestruct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V16(u16), V32(u32) }
 struct S(E, u16, u16);
diff --git a/src/test/run-pass/const-enum-tuplestruct2.rs b/src/test/run-pass/const-enum-tuplestruct2.rs
index 3d7b6c9f49f..88cfc0dec70 100644
--- a/src/test/run-pass/const-enum-tuplestruct2.rs
+++ b/src/test/run-pass/const-enum-tuplestruct2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V0, V16(u16) }
 struct S(E, u16, u16);
diff --git a/src/test/run-pass/const-enum-vec-index.rs b/src/test/run-pass/const-enum-vec-index.rs
index fcaf8b8844b..2f1cd8dbf9b 100644
--- a/src/test/run-pass/const-enum-vec-index.rs
+++ b/src/test/run-pass/const-enum-vec-index.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V1(isize), V0 }
 const C: &'static [E] = &[E::V0, E::V1(0xDEADBEE)];
diff --git a/src/test/run-pass/const-enum-vec-ptr.rs b/src/test/run-pass/const-enum-vec-ptr.rs
index 936d72ac65e..de94527a604 100644
--- a/src/test/run-pass/const-enum-vec-ptr.rs
+++ b/src/test/run-pass/const-enum-vec-ptr.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V1(isize), V0 }
 static C: &'static [E] = &[E::V0, E::V1(0xDEADBEE), E::V0];
diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/run-pass/const-enum-vector.rs
index 6fdf0c3948f..8d43a76bc28 100644
--- a/src/test/run-pass/const-enum-vector.rs
+++ b/src/test/run-pass/const-enum-vector.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E { V1(isize), V0 }
 static C: [E; 3] = [E::V0, E::V1(0xDEADBEE), E::V0];
diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/run-pass/const-extern-function.rs
index ff829711a4c..214b0400e86 100644
--- a/src/test/run-pass/const-extern-function.rs
+++ b/src/test/run-pass/const-extern-function.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 extern fn foopy() {}
 
diff --git a/src/test/run-pass/const-fn-val.rs b/src/test/run-pass/const-fn-val.rs
index 3e1058dc27d..85c92dda434 100644
--- a/src/test/run-pass/const-fn-val.rs
+++ b/src/test/run-pass/const-fn-val.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo() -> isize {
     return 0xca7f000d;
diff --git a/src/test/run-pass/const-negative.rs b/src/test/run-pass/const-negative.rs
index 59b2c3e36aa..7f26a977339 100644
--- a/src/test/run-pass/const-negative.rs
+++ b/src/test/run-pass/const-negative.rs
@@ -10,7 +10,6 @@
 
 // Issue #358
 
-// pretty-expanded FIXME #23616
 
 static toplevel_mod: isize = -1;
 
diff --git a/src/test/run-pass/const-nullary-enum.rs b/src/test/run-pass/const-nullary-enum.rs
index fcad89470d7..b3f6549ef01 100644
--- a/src/test/run-pass/const-nullary-enum.rs
+++ b/src/test/run-pass/const-nullary-enum.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     Bar,
diff --git a/src/test/run-pass/const-nullary-univariant-enum.rs b/src/test/run-pass/const-nullary-univariant-enum.rs
index 51926ececc2..b1b7f782cd0 100644
--- a/src/test/run-pass/const-nullary-univariant-enum.rs
+++ b/src/test/run-pass/const-nullary-univariant-enum.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 enum Foo {
diff --git a/src/test/run-pass/const-region-ptrs-noncopy.rs b/src/test/run-pass/const-region-ptrs-noncopy.rs
index 8932853fbf4..9a1f747ce59 100644
--- a/src/test/run-pass/const-region-ptrs-noncopy.rs
+++ b/src/test/run-pass/const-region-ptrs-noncopy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 type Big = [u64; 8];
 struct Pair<'a> { a: isize, b: &'a Big }
diff --git a/src/test/run-pass/const-str-ptr.rs b/src/test/run-pass/const-str-ptr.rs
index c5ff134ff0e..1cdb98a8bc0 100644
--- a/src/test/run-pass/const-str-ptr.rs
+++ b/src/test/run-pass/const-str-ptr.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::{str, string};
 
diff --git a/src/test/run-pass/const-tuple-struct.rs b/src/test/run-pass/const-tuple-struct.rs
index ccf1b06bacb..ddc50fc6646 100644
--- a/src/test/run-pass/const-tuple-struct.rs
+++ b/src/test/run-pass/const-tuple-struct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Bar(isize, isize);
 
diff --git a/src/test/run-pass/consts-in-patterns.rs b/src/test/run-pass/consts-in-patterns.rs
index c2f7cf4d625..36e6e160a3b 100644
--- a/src/test/run-pass/consts-in-patterns.rs
+++ b/src/test/run-pass/consts-in-patterns.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const FOO: isize = 10;
 const BAR: isize = 3;
diff --git a/src/test/run-pass/cross-crate-newtype-struct-pat.rs b/src/test/run-pass/cross-crate-newtype-struct-pat.rs
index 986108c5d8f..7eae9017420 100644
--- a/src/test/run-pass/cross-crate-newtype-struct-pat.rs
+++ b/src/test/run-pass/cross-crate-newtype-struct-pat.rs
@@ -10,7 +10,6 @@
 
 // aux-build:newtype_struct_xc.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate newtype_struct_xc;
 
diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs
index 16636fadbf8..f8e690cf29e 100644
--- a/src/test/run-pass/deep.rs
+++ b/src/test/run-pass/deep.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 fn f(x: isize) -> isize {
     if x == 1 { return 1; } else { let y: isize = 1 + f(x - 1); return y; }
diff --git a/src/test/run-pass/deref-mut-on-ref.rs b/src/test/run-pass/deref-mut-on-ref.rs
index 8820003d3b2..98441d7daaa 100644
--- a/src/test/run-pass/deref-mut-on-ref.rs
+++ b/src/test/run-pass/deref-mut-on-ref.rs
@@ -10,7 +10,6 @@
 
 // Test that `&mut T` implements `DerefMut<T>`
 
-// pretty-expanded FIXME #23616
 
 use std::ops::{Deref, DerefMut};
 
diff --git a/src/test/run-pass/deref-on-ref.rs b/src/test/run-pass/deref-on-ref.rs
index 84bfbd82297..383c8197f94 100644
--- a/src/test/run-pass/deref-on-ref.rs
+++ b/src/test/run-pass/deref-on-ref.rs
@@ -10,7 +10,6 @@
 
 // Test that `&T` and `&mut T` implement `Deref<T>`
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Deref;
 
diff --git a/src/test/run-pass/deref-rc.rs b/src/test/run-pass/deref-rc.rs
index 761b29258f2..b84d78b4f4f 100644
--- a/src/test/run-pass/deref-rc.rs
+++ b/src/test/run-pass/deref-rc.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::rc::Rc;
 
diff --git a/src/test/run-pass/deriving-cmp-generic-enum.rs b/src/test/run-pass/deriving-cmp-generic-enum.rs
index 07ad8f706eb..b1cd1877a76 100644
--- a/src/test/run-pass/deriving-cmp-generic-enum.rs
+++ b/src/test/run-pass/deriving-cmp-generic-enum.rs
@@ -10,7 +10,6 @@
 
 // no-pretty-expanded FIXME #15189
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 enum E<T> {
diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs
index 5f7d184f194..14f7862ef21 100644
--- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs
+++ b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs
@@ -10,7 +10,6 @@
 
 // no-pretty-expanded FIXME #15189
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 enum ES<T> {
diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/run-pass/deriving-cmp-generic-struct.rs
index ea0017380b2..5c7d806f519 100644
--- a/src/test/run-pass/deriving-cmp-generic-struct.rs
+++ b/src/test/run-pass/deriving-cmp-generic-struct.rs
@@ -10,7 +10,6 @@
 
 // no-pretty-expanded FIXME #15189
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct S<T> {
diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs
index 702071676b9..b7bfb91b278 100644
--- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs
+++ b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs
@@ -10,7 +10,6 @@
 
 // no-pretty-expanded FIXME #15189
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct TS<T>(T,T);
diff --git a/src/test/run-pass/deriving-cmp-shortcircuit.rs b/src/test/run-pass/deriving-cmp-shortcircuit.rs
index 1669f3fdd3d..e22e4767d52 100644
--- a/src/test/run-pass/deriving-cmp-shortcircuit.rs
+++ b/src/test/run-pass/deriving-cmp-shortcircuit.rs
@@ -12,7 +12,6 @@
 // where possible, by having a type that panics when compared as the
 // second element, so this passes iff the instances shortcircuit.
 
-// pretty-expanded FIXME #23616
 
 use std::cmp::Ordering;
 
diff --git a/src/test/run-pass/deriving-default-box.rs b/src/test/run-pass/deriving-default-box.rs
index 574a620ef02..dc31e71aad8 100644
--- a/src/test/run-pass/deriving-default-box.rs
+++ b/src/test/run-pass/deriving-default-box.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/deriving-encodable-decodable-box.rs b/src/test/run-pass/deriving-encodable-decodable-box.rs
index 6ccedb0ad98..db5a1f3f000 100644
--- a/src/test/run-pass/deriving-encodable-decodable-box.rs
+++ b/src/test/run-pass/deriving-encodable-decodable-box.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs b/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs
index d216062bb2d..7cc59edfcab 100644
--- a/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs
+++ b/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs
@@ -11,7 +11,6 @@
 // This briefly tests the capability of `Cell` and `RefCell` to implement the
 // `Encodable` and `Decodable` traits via `#[derive(Encodable, Decodable)]`
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/deriving-hash.rs b/src/test/run-pass/deriving-hash.rs
index ce7ba9f25eb..287750e5051 100644
--- a/src/test/run-pass/deriving-hash.rs
+++ b/src/test/run-pass/deriving-hash.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(hash)]
 
diff --git a/src/test/run-pass/deriving-rand.rs b/src/test/run-pass/deriving-rand.rs
index b960c2ddd4a..bc11b55d310 100644
--- a/src/test/run-pass/deriving-rand.rs
+++ b/src/test/run-pass/deriving-rand.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(rand)]
 
diff --git a/src/test/run-pass/destructure-array-1.rs b/src/test/run-pass/destructure-array-1.rs
index e2c96085714..0d24f0bd0d7 100644
--- a/src/test/run-pass/destructure-array-1.rs
+++ b/src/test/run-pass/destructure-array-1.rs
@@ -11,7 +11,6 @@
 // Ensure that we can do a destructuring bind of a fixed-size array,
 // even when the element type has a destructor.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/die-macro.rs b/src/test/run-pass/die-macro.rs
index 6a81ebe67ba..0816e258e84 100644
--- a/src/test/run-pass/die-macro.rs
+++ b/src/test/run-pass/die-macro.rs
@@ -10,7 +10,6 @@
 
 // Just testing that panic!() type checks in statement or expr
 
-// pretty-expanded FIXME #23616
 
 #![allow(unreachable_code)]
 
diff --git a/src/test/run-pass/div-mod.rs b/src/test/run-pass/div-mod.rs
index 237cfe19dc4..b6cae71df86 100644
--- a/src/test/run-pass/div-mod.rs
+++ b/src/test/run-pass/div-mod.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x: isize = 15;
diff --git a/src/test/run-pass/drop-struct-as-object.rs b/src/test/run-pass/drop-struct-as-object.rs
index efb98160a3e..33d5c72772c 100644
--- a/src/test/run-pass/drop-struct-as-object.rs
+++ b/src/test/run-pass/drop-struct-as-object.rs
@@ -11,7 +11,6 @@
 // Test that destructor on a struct runs successfully after the struct
 // is boxed and converted to an object.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/drop-with-type-ascription-1.rs b/src/test/run-pass/drop-with-type-ascription-1.rs
index ea9edff4945..9dd458344cb 100644
--- a/src/test/run-pass/drop-with-type-ascription-1.rs
+++ b/src/test/run-pass/drop-with-type-ascription-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(str_words)]
 
diff --git a/src/test/run-pass/drop-with-type-ascription-2.rs b/src/test/run-pass/drop-with-type-ascription-2.rs
index 3d4af80e30b..cb3712dea32 100644
--- a/src/test/run-pass/drop-with-type-ascription-2.rs
+++ b/src/test/run-pass/drop-with-type-ascription-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/dropck_tarena_sound_drop.rs b/src/test/run-pass/dropck_tarena_sound_drop.rs
index df29b8e10c7..6ccf6c2fd64 100644
--- a/src/test/run-pass/dropck_tarena_sound_drop.rs
+++ b/src/test/run-pass/dropck_tarena_sound_drop.rs
@@ -16,7 +16,6 @@
 // shows a similar setup, but restricts `f` so that the struct `C<'a>`
 // is force-fed a lifetime equal to that of the borrowed arena.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unstable)]
 #![feature(unsafe_destructor, rustc_private)]
diff --git a/src/test/run-pass/dst-deref-mut.rs b/src/test/run-pass/dst-deref-mut.rs
index 3b2b7493fd0..b031c82a07f 100644
--- a/src/test/run-pass/dst-deref-mut.rs
+++ b/src/test/run-pass/dst-deref-mut.rs
@@ -10,7 +10,6 @@
 
 // Test that a custom deref with a fat pointer return type does not ICE
 
-// pretty-expanded FIXME #23616
 
 use std::ops::{Deref, DerefMut};
 
diff --git a/src/test/run-pass/dst-deref.rs b/src/test/run-pass/dst-deref.rs
index c8e658beef8..c4666d05fbf 100644
--- a/src/test/run-pass/dst-deref.rs
+++ b/src/test/run-pass/dst-deref.rs
@@ -10,7 +10,6 @@
 
 // Test that a custom deref with a fat pointer return type does not ICE
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Deref;
 
diff --git a/src/test/run-pass/dst-index.rs b/src/test/run-pass/dst-index.rs
index df4cd74740c..34a187fa6f2 100644
--- a/src/test/run-pass/dst-index.rs
+++ b/src/test/run-pass/dst-index.rs
@@ -11,7 +11,6 @@
 // Test that overloaded index expressions with DST result types
 // work and don't ICE.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/dst-raw.rs b/src/test/run-pass/dst-raw.rs
index 5e0e5bd03fe..d899de91640 100644
--- a/src/test/run-pass/dst-raw.rs
+++ b/src/test/run-pass/dst-raw.rs
@@ -10,7 +10,6 @@
 
 // Test DST raw pointers
 
-// pretty-expanded FIXME #23616
 
 trait Trait {
     fn foo(&self) -> isize;
diff --git a/src/test/run-pass/dst-struct-sole.rs b/src/test/run-pass/dst-struct-sole.rs
index 9bf286c4342..d440fb2a216 100644
--- a/src/test/run-pass/dst-struct-sole.rs
+++ b/src/test/run-pass/dst-struct-sole.rs
@@ -10,7 +10,6 @@
 
 // As dst-struct.rs, but the unsized field is the only field in the struct.
 
-// pretty-expanded FIXME #23616
 
 struct Fat<T: ?Sized> {
     ptr: T
diff --git a/src/test/run-pass/dst-struct.rs b/src/test/run-pass/dst-struct.rs
index 5198dd43d6d..8b6db23026b 100644
--- a/src/test/run-pass/dst-struct.rs
+++ b/src/test/run-pass/dst-struct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/dst-trait.rs b/src/test/run-pass/dst-trait.rs
index 370bc288227..4d2b50c08e2 100644
--- a/src/test/run-pass/dst-trait.rs
+++ b/src/test/run-pass/dst-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/else-if.rs b/src/test/run-pass/else-if.rs
index 79c2f450678..afc1d200b27 100644
--- a/src/test/run-pass/else-if.rs
+++ b/src/test/run-pass/else-if.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     if 1 == 2 {
diff --git a/src/test/run-pass/empty-allocation-non-null.rs b/src/test/run-pass/empty-allocation-non-null.rs
index cec528fa040..af6e321e40a 100644
--- a/src/test/run-pass/empty-allocation-non-null.rs
+++ b/src/test/run-pass/empty-allocation-non-null.rs
@@ -10,7 +10,6 @@
 
 // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert!(Some(Box::new(())).is_some());
diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/run-pass/enum-alignment.rs
index df779d0d713..827894f8f32 100644
--- a/src/test/run-pass/enum-alignment.rs
+++ b/src/test/run-pass/enum-alignment.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/enum-clike-ffi-as-int.rs b/src/test/run-pass/enum-clike-ffi-as-int.rs
index f129a515341..8be3634c88a 100644
--- a/src/test/run-pass/enum-clike-ffi-as-int.rs
+++ b/src/test/run-pass/enum-clike-ffi-as-int.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 /*!
  * C-like enums have to be represented as LLVM ints, not wrapped in a
diff --git a/src/test/run-pass/enum-discr.rs b/src/test/run-pass/enum-discr.rs
index 5c01d544cf5..1ff63701360 100644
--- a/src/test/run-pass/enum-discr.rs
+++ b/src/test/run-pass/enum-discr.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Animal {
     Cat = 0,
diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/run-pass/enum-discrim-autosizing.rs
index 239f9821b92..99e44735d0f 100644
--- a/src/test/run-pass/enum-discrim-autosizing.rs
+++ b/src/test/run-pass/enum-discrim-autosizing.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::size_of;
 
diff --git a/src/test/run-pass/enum-discrim-manual-sizing.rs b/src/test/run-pass/enum-discrim-manual-sizing.rs
index b23cfa9f32b..edad5cc1652 100644
--- a/src/test/run-pass/enum-discrim-manual-sizing.rs
+++ b/src/test/run-pass/enum-discrim-manual-sizing.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::size_of;
 
diff --git a/src/test/run-pass/enum-disr-val-pretty.rs b/src/test/run-pass/enum-disr-val-pretty.rs
index 9a2f45d0079..cf667251780 100644
--- a/src/test/run-pass/enum-disr-val-pretty.rs
+++ b/src/test/run-pass/enum-disr-val-pretty.rs
@@ -10,7 +10,6 @@
 
 // pp-exact
 
-// pretty-expanded FIXME #23616
 
 enum color { red = 1, green, blue, imaginary = -1, }
 
diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/run-pass/enum-null-pointer-opt.rs
index 9fc799a97f6..499d131947a 100644
--- a/src/test/run-pass/enum-null-pointer-opt.rs
+++ b/src/test/run-pass/enum-null-pointer-opt.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/enum-nullable-const-null-with-fields.rs b/src/test/run-pass/enum-nullable-const-null-with-fields.rs
index 3a7c7ea9a71..1342c4e104d 100644
--- a/src/test/run-pass/enum-nullable-const-null-with-fields.rs
+++ b/src/test/run-pass/enum-nullable-const-null-with-fields.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::result::Result;
 use std::result::Result::Ok;
diff --git a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs
index 99554aafb04..c8a1047cfa8 100644
--- a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs
+++ b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/env-home-dir.rs b/src/test/run-pass/env-home-dir.rs
index 7fb96112125..efe72729817 100644
--- a/src/test/run-pass/env-home-dir.rs
+++ b/src/test/run-pass/env-home-dir.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(path)]
 
diff --git a/src/test/run-pass/env-vars.rs b/src/test/run-pass/env-vars.rs
index 33bc6c596db..d86f63c9cb9 100644
--- a/src/test/run-pass/env-vars.rs
+++ b/src/test/run-pass/env-vars.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::env::*;
 
diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/run-pass/eq-multidispatch.rs
index 3ca254021e5..bf8b089a830 100644
--- a/src/test/run-pass/eq-multidispatch.rs
+++ b/src/test/run-pass/eq-multidispatch.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq)]
 struct Bar;
diff --git a/src/test/run-pass/estr-uniq.rs b/src/test/run-pass/estr-uniq.rs
index 0b24658a8f3..4dfb1541840 100644
--- a/src/test/run-pass/estr-uniq.rs
+++ b/src/test/run-pass/estr-uniq.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
 
diff --git a/src/test/run-pass/exec-env.rs b/src/test/run-pass/exec-env.rs
index a2493073247..d17056e6d79 100644
--- a/src/test/run-pass/exec-env.rs
+++ b/src/test/run-pass/exec-env.rs
@@ -10,7 +10,6 @@
 
 // exec-env:TEST_EXEC_ENV=22
 
-// pretty-expanded FIXME #23616
 
 use std::env;
 
diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/run-pass/explicit-self-generic.rs
index ee50d3bdf0e..1b50d3028b1 100644
--- a/src/test/run-pass/explicit-self-generic.rs
+++ b/src/test/run-pass/explicit-self-generic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/explicit-self-objects-uniq.rs b/src/test/run-pass/explicit-self-objects-uniq.rs
index 08ea638f93a..4021ae89e36 100644
--- a/src/test/run-pass/explicit-self-objects-uniq.rs
+++ b/src/test/run-pass/explicit-self-objects-uniq.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/explicit-self.rs b/src/test/run-pass/explicit-self.rs
index b81090555ea..d2a0d60eb66 100644
--- a/src/test/run-pass/explicit-self.rs
+++ b/src/test/run-pass/explicit-self.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/run-pass/expr-block-fn.rs
index c88721471b6..67e41aad697 100644
--- a/src/test/run-pass/expr-block-fn.rs
+++ b/src/test/run-pass/expr-block-fn.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 fn test_fn() {
     fn ten() -> isize { return 10; }
diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/run-pass/expr-block-generic-unique2.rs
index bd293677395..5477a9227aa 100644
--- a/src/test/run-pass/expr-block-generic-unique2.rs
+++ b/src/test/run-pass/expr-block-generic-unique2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs
index d26c6e62f53..8795962bebd 100644
--- a/src/test/run-pass/expr-block-generic.rs
+++ b/src/test/run-pass/expr-block-generic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test_generic<T: Clone, F>(expected: T, eq: F) where F: FnOnce(T, T) -> bool {
     let actual: T = { expected.clone() };
diff --git a/src/test/run-pass/expr-block-slot.rs b/src/test/run-pass/expr-block-slot.rs
index 57b5a426f5c..d9b4c95bc24 100644
--- a/src/test/run-pass/expr-block-slot.rs
+++ b/src/test/run-pass/expr-block-slot.rs
@@ -10,7 +10,6 @@
 
 // Regression test for issue #377
 
-// pretty-expanded FIXME #23616
 
 struct A { a: isize }
 struct V { v: isize }
diff --git a/src/test/run-pass/expr-block-unique.rs b/src/test/run-pass/expr-block-unique.rs
index 496a575c6c8..7ad02418601 100644
--- a/src/test/run-pass/expr-block-unique.rs
+++ b/src/test/run-pass/expr-block-unique.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-block.rs b/src/test/run-pass/expr-block.rs
index 64f86237ab3..38be041938b 100644
--- a/src/test/run-pass/expr-block.rs
+++ b/src/test/run-pass/expr-block.rs
@@ -13,7 +13,6 @@
 
 
 // Tests for standalone blocks as expressions
-// pretty-expanded FIXME #23616
 
 fn test_basic() { let rs: bool = { true }; assert!((rs)); }
 
diff --git a/src/test/run-pass/expr-copy.rs b/src/test/run-pass/expr-copy.rs
index ca394f991f2..99e74a6b856 100644
--- a/src/test/run-pass/expr-copy.rs
+++ b/src/test/run-pass/expr-copy.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn f(arg: &mut A) {
     arg.a = 100;
diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs
index 0c9151cec7d..aeca388d317 100644
--- a/src/test/run-pass/expr-fn.rs
+++ b/src/test/run-pass/expr-fn.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn test_int() {
     fn f() -> isize { 10 }
diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs
index 47e79de6b11..94c6b70bb62 100644
--- a/src/test/run-pass/expr-if-generic.rs
+++ b/src/test/run-pass/expr-if-generic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test_generic<T, F>(expected: T, not_expected: T, eq: F) where
     T: Clone,
diff --git a/src/test/run-pass/expr-if-panic-all.rs b/src/test/run-pass/expr-if-panic-all.rs
index 1e631c20479..43110533b6d 100644
--- a/src/test/run-pass/expr-if-panic-all.rs
+++ b/src/test/run-pass/expr-if-panic-all.rs
@@ -10,7 +10,6 @@
 
 // When all branches of an if expression result in panic, the entire if
 // expression results in panic.
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _x = if true {
diff --git a/src/test/run-pass/expr-if-panic.rs b/src/test/run-pass/expr-if-panic.rs
index e8594db8039..c7f10b66ca3 100644
--- a/src/test/run-pass/expr-if-panic.rs
+++ b/src/test/run-pass/expr-if-panic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test_if_panic() {
     let x = if false { panic!() } else { 10 };
diff --git a/src/test/run-pass/expr-if-unique.rs b/src/test/run-pass/expr-if-unique.rs
index 99c5053588b..12000fd54e7 100644
--- a/src/test/run-pass/expr-if-unique.rs
+++ b/src/test/run-pass/expr-if-unique.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-if.rs b/src/test/run-pass/expr-if.rs
index 345f17707c4..e8458e32011 100644
--- a/src/test/run-pass/expr-if.rs
+++ b/src/test/run-pass/expr-if.rs
@@ -13,7 +13,6 @@
 
 
 // Tests for if as expressions
-// pretty-expanded FIXME #23616
 
 fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
 
diff --git a/src/test/run-pass/expr-match-generic-unique1.rs b/src/test/run-pass/expr-match-generic-unique1.rs
index 7cd0f6a7589..738fcecb2e0 100644
--- a/src/test/run-pass/expr-match-generic-unique1.rs
+++ b/src/test/run-pass/expr-match-generic-unique1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-match-generic-unique2.rs b/src/test/run-pass/expr-match-generic-unique2.rs
index 95f47d005d3..88ea2415241 100644
--- a/src/test/run-pass/expr-match-generic-unique2.rs
+++ b/src/test/run-pass/expr-match-generic-unique2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-match-generic.rs b/src/test/run-pass/expr-match-generic.rs
index f8e82de9a0a..509106289d0 100644
--- a/src/test/run-pass/expr-match-generic.rs
+++ b/src/test/run-pass/expr-match-generic.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 type compare<T> = extern "Rust" fn(T, T) -> bool;
 
diff --git a/src/test/run-pass/expr-match-panic-all.rs b/src/test/run-pass/expr-match-panic-all.rs
index 664ead10aae..e712d552a81 100644
--- a/src/test/run-pass/expr-match-panic-all.rs
+++ b/src/test/run-pass/expr-match-panic-all.rs
@@ -13,7 +13,6 @@
 
 // When all branches of a match expression result in panic, the entire
 // match expression results in panic.
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _x =
diff --git a/src/test/run-pass/expr-match-panic.rs b/src/test/run-pass/expr-match-panic.rs
index 40e7a6175cf..89dc7b09c7b 100644
--- a/src/test/run-pass/expr-match-panic.rs
+++ b/src/test/run-pass/expr-match-panic.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn test_simple() {
     let r = match true { true => { true } false => { panic!() } };
diff --git a/src/test/run-pass/expr-match-unique.rs b/src/test/run-pass/expr-match-unique.rs
index 51eda4c7663..e752c20a512 100644
--- a/src/test/run-pass/expr-match-unique.rs
+++ b/src/test/run-pass/expr-match-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/expr-match.rs b/src/test/run-pass/expr-match.rs
index 2282391ef6f..580ee52ed36 100644
--- a/src/test/run-pass/expr-match.rs
+++ b/src/test/run-pass/expr-match.rs
@@ -13,7 +13,6 @@
 
 
 // Tests for using match as an expression
-// pretty-expanded FIXME #23616
 
 fn test_basic() {
     let mut rs: bool = match true { true => { true } false => { false } };
diff --git a/src/test/run-pass/ext-expand-inner-exprs.rs b/src/test/run-pass/ext-expand-inner-exprs.rs
index 46cd73e1152..90ca31e80be 100644
--- a/src/test/run-pass/ext-expand-inner-exprs.rs
+++ b/src/test/run-pass/ext-expand-inner-exprs.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static FOO : &'static str = concat!(concat!("hel", "lo"), "world");
 
diff --git a/src/test/run-pass/exterior.rs b/src/test/run-pass/exterior.rs
index 9a039e8bc35..3474e2eefb7 100644
--- a/src/test/run-pass/exterior.rs
+++ b/src/test/run-pass/exterior.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/extern-call-direct.rs b/src/test/run-pass/extern-call-direct.rs
index 38cd4a8d79d..ec6b6c8d39f 100644
--- a/src/test/run-pass/extern-call-direct.rs
+++ b/src/test/run-pass/extern-call-direct.rs
@@ -10,7 +10,6 @@
 
 // Test direct calls to extern fns.
 
-// pretty-expanded FIXME #23616
 
 extern fn f(x: usize) -> usize { x * 2 }
 
diff --git a/src/test/run-pass/extern-compare-with-return-type.rs b/src/test/run-pass/extern-compare-with-return-type.rs
index 09411c9c6eb..6535ae2fca9 100644
--- a/src/test/run-pass/extern-compare-with-return-type.rs
+++ b/src/test/run-pass/extern-compare-with-return-type.rs
@@ -10,7 +10,6 @@
 
 // Tests that we can compare various kinds of extern fn signatures.
 
-// pretty-expanded FIXME #23616
 
 extern fn voidret1() {}
 extern fn voidret2() {}
diff --git a/src/test/run-pass/extern-methods.rs b/src/test/run-pass/extern-methods.rs
index 246f65931b7..28a076113d1 100644
--- a/src/test/run-pass/extern-methods.rs
+++ b/src/test/run-pass/extern-methods.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/extern-pass-char.rs b/src/test/run-pass/extern-pass-char.rs
index bbdf5cf64a1..e75aa2d72c9 100644
--- a/src/test/run-pass/extern-pass-char.rs
+++ b/src/test/run-pass/extern-pass-char.rs
@@ -10,7 +10,6 @@
 
 // Test a function that takes/returns a u8.
 
-// pretty-expanded FIXME #23616
 
 #[link(name = "rust_test_helpers")]
 extern {
diff --git a/src/test/run-pass/extern-pass-double.rs b/src/test/run-pass/extern-pass-double.rs
index 24c461f43ad..e92f9b6a1a1 100644
--- a/src/test/run-pass/extern-pass-double.rs
+++ b/src/test/run-pass/extern-pass-double.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[link(name = "rust_test_helpers")]
 extern {
diff --git a/src/test/run-pass/extern-pass-u32.rs b/src/test/run-pass/extern-pass-u32.rs
index f93d7a3ff96..0753ea1bcfe 100644
--- a/src/test/run-pass/extern-pass-u32.rs
+++ b/src/test/run-pass/extern-pass-u32.rs
@@ -10,7 +10,6 @@
 
 // Test a function that takes/returns a u32.
 
-// pretty-expanded FIXME #23616
 
 #[link(name = "rust_test_helpers")]
 extern {
diff --git a/src/test/run-pass/extern-pass-u64.rs b/src/test/run-pass/extern-pass-u64.rs
index 961a3dce168..89faa3bb471 100644
--- a/src/test/run-pass/extern-pass-u64.rs
+++ b/src/test/run-pass/extern-pass-u64.rs
@@ -10,7 +10,6 @@
 
 // Test a call to a function that takes/returns a u64.
 
-// pretty-expanded FIXME #23616
 
 #[link(name = "rust_test_helpers")]
 extern {
diff --git a/src/test/run-pass/extern-return-TwoU16s.rs b/src/test/run-pass/extern-return-TwoU16s.rs
index f149a134622..3c58646e0c3 100644
--- a/src/test/run-pass/extern-return-TwoU16s.rs
+++ b/src/test/run-pass/extern-return-TwoU16s.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub struct TwoU16s {
     one: u16, two: u16
diff --git a/src/test/run-pass/extern-return-TwoU32s.rs b/src/test/run-pass/extern-return-TwoU32s.rs
index 4e9c44ef75e..0eb6be2d687 100644
--- a/src/test/run-pass/extern-return-TwoU32s.rs
+++ b/src/test/run-pass/extern-return-TwoU32s.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub struct TwoU32s {
     one: u32, two: u32
diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/run-pass/extern-return-TwoU64s.rs
index fffd77fa897..d5eab86351e 100644
--- a/src/test/run-pass/extern-return-TwoU64s.rs
+++ b/src/test/run-pass/extern-return-TwoU64s.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub struct TwoU64s {
     one: u64, two: u64
diff --git a/src/test/run-pass/extern-return-TwoU8s.rs b/src/test/run-pass/extern-return-TwoU8s.rs
index fdf43d4332a..d8f476bcd0c 100644
--- a/src/test/run-pass/extern-return-TwoU8s.rs
+++ b/src/test/run-pass/extern-return-TwoU8s.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub struct TwoU8s {
     one: u8, two: u8
diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/run-pass/extern-take-value.rs
index c016e4e62f5..7ef87b9409d 100644
--- a/src/test/run-pass/extern-take-value.rs
+++ b/src/test/run-pass/extern-take-value.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 extern fn f() {
 }
diff --git a/src/test/run-pass/extoption_env-not-defined.rs b/src/test/run-pass/extoption_env-not-defined.rs
index aaa8f6cf26f..352f68da985 100644
--- a/src/test/run-pass/extoption_env-not-defined.rs
+++ b/src/test/run-pass/extoption_env-not-defined.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none());
diff --git a/src/test/run-pass/field-destruction-order.rs b/src/test/run-pass/field-destruction-order.rs
index aab32a7e7bd..624167db36d 100644
--- a/src/test/run-pass/field-destruction-order.rs
+++ b/src/test/run-pass/field-destruction-order.rs
@@ -21,7 +21,6 @@
 // declarations, but we currently run them top-to-bottom. I don't think the
 // order really matters that much as long as we define what it is.
 
-// pretty-expanded FIXME #23616
 
 struct A;
 struct B;
diff --git a/src/test/run-pass/fixed_length_copy.rs b/src/test/run-pass/fixed_length_copy.rs
index 019537a2ab8..eefd9447535 100644
--- a/src/test/run-pass/fixed_length_copy.rs
+++ b/src/test/run-pass/fixed_length_copy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let arr = [1,2,3];
diff --git a/src/test/run-pass/float2.rs b/src/test/run-pass/float2.rs
index f84cbe52354..e9f6e0f51b4 100644
--- a/src/test/run-pass/float2.rs
+++ b/src/test/run-pass/float2.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let a = 1.5e6f64;
diff --git a/src/test/run-pass/floatlits.rs b/src/test/run-pass/floatlits.rs
index d45c689bfda..d133f3463a3 100644
--- a/src/test/run-pass/floatlits.rs
+++ b/src/test/run-pass/floatlits.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let f = 4.999999999999f64;
diff --git a/src/test/run-pass/fn-bare-assign.rs b/src/test/run-pass/fn-bare-assign.rs
index d83dc785805..2d3d4cbffd0 100644
--- a/src/test/run-pass/fn-bare-assign.rs
+++ b/src/test/run-pass/fn-bare-assign.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f(i: isize, called: &mut bool) {
     assert_eq!(i, 10);
diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/run-pass/fn-bare-size.rs
index 117cf13584f..3ed4f103af0 100644
--- a/src/test/run-pass/fn-bare-size.rs
+++ b/src/test/run-pass/fn-bare-size.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/fn-bare-spawn.rs b/src/test/run-pass/fn-bare-spawn.rs
index 0a3c8916270..e6ee77cb62b 100644
--- a/src/test/run-pass/fn-bare-spawn.rs
+++ b/src/test/run-pass/fn-bare-spawn.rs
@@ -10,7 +10,6 @@
 
 // This is what the signature to spawn should look like with bare functions
 
-// pretty-expanded FIXME #23616
 
 fn spawn<T:Send>(val: T, f: fn(T)) {
     f(val);
diff --git a/src/test/run-pass/fn-item-type-cast.rs b/src/test/run-pass/fn-item-type-cast.rs
index f8b1582c515..9a8a8d4782e 100644
--- a/src/test/run-pass/fn-item-type-cast.rs
+++ b/src/test/run-pass/fn-item-type-cast.rs
@@ -10,7 +10,6 @@
 
 // Test explicit coercions from a fn item type to a fn pointer type.
 
-// pretty-expanded FIXME #23616
 
 fn foo(x: isize) -> isize { x * 2 }
 fn bar(x: isize) -> isize { x * 4 }
diff --git a/src/test/run-pass/fn-pattern-expected-type.rs b/src/test/run-pass/fn-pattern-expected-type.rs
index 352d0b13c64..2e9607602fd 100644
--- a/src/test/run-pass/fn-pattern-expected-type.rs
+++ b/src/test/run-pass/fn-pattern-expected-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let f = |(x, y): (isize, isize)| {
diff --git a/src/test/run-pass/for-destruct.rs b/src/test/run-pass/for-destruct.rs
index 9d8c432e982..963d34a2d2f 100644
--- a/src/test/run-pass/for-destruct.rs
+++ b/src/test/run-pass/for-destruct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Pair { x: isize, y: isize }
 
diff --git a/src/test/run-pass/for-loop-goofiness.rs b/src/test/run-pass/for-loop-goofiness.rs
index 4b6b6dcf1d5..411183e4f74 100644
--- a/src/test/run-pass/for-loop-goofiness.rs
+++ b/src/test/run-pass/for-loop-goofiness.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum BogusOption<T> {
     None,
diff --git a/src/test/run-pass/for-loop-into-iterator.rs b/src/test/run-pass/for-loop-into-iterator.rs
index 109ca26056f..7efd15f222e 100644
--- a/src/test/run-pass/for-loop-into-iterator.rs
+++ b/src/test/run-pass/for-loop-into-iterator.rs
@@ -10,7 +10,6 @@
 
 // Test that for loops can do what RFC #235 claims
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let mut v = vec![1];
diff --git a/src/test/run-pass/for-loop-panic.rs b/src/test/run-pass/for-loop-panic.rs
index 908932fe396..001ca1a02f6 100644
--- a/src/test/run-pass/for-loop-panic.rs
+++ b/src/test/run-pass/for-loop-panic.rs
@@ -9,6 +9,5 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() { let x: Vec<isize> = Vec::new(); for _ in &x { panic!("moop"); } }
diff --git a/src/test/run-pass/foreach-external-iterators-break.rs b/src/test/run-pass/foreach-external-iterators-break.rs
index bc041259895..bfc0d6cf9d5 100644
--- a/src/test/run-pass/foreach-external-iterators-break.rs
+++ b/src/test/run-pass/foreach-external-iterators-break.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = [1; 100];
diff --git a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs b/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs
index cc02ee1459b..cedb9601431 100644
--- a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs
+++ b/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/foreach-external-iterators-hashmap.rs b/src/test/run-pass/foreach-external-iterators-hashmap.rs
index 065e4cfb768..79304fce5c1 100644
--- a/src/test/run-pass/foreach-external-iterators-hashmap.rs
+++ b/src/test/run-pass/foreach-external-iterators-hashmap.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/foreach-external-iterators-loop.rs b/src/test/run-pass/foreach-external-iterators-loop.rs
index 60cfc9be078..7248537d6a1 100644
--- a/src/test/run-pass/foreach-external-iterators-loop.rs
+++ b/src/test/run-pass/foreach-external-iterators-loop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = [1; 100];
diff --git a/src/test/run-pass/foreach-external-iterators-nested.rs b/src/test/run-pass/foreach-external-iterators-nested.rs
index a075c08b737..87aa3d84003 100644
--- a/src/test/run-pass/foreach-external-iterators-nested.rs
+++ b/src/test/run-pass/foreach-external-iterators-nested.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = [1; 100];
diff --git a/src/test/run-pass/foreach-external-iterators.rs b/src/test/run-pass/foreach-external-iterators.rs
index 2248132d828..d1fe98f5431 100644
--- a/src/test/run-pass/foreach-external-iterators.rs
+++ b/src/test/run-pass/foreach-external-iterators.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = [1; 100];
diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs
index 075539b621a..60068185f5a 100644
--- a/src/test/run-pass/foreach-nested.rs
+++ b/src/test/run-pass/foreach-nested.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn two<F>(mut it: F) where F: FnMut(isize) { it(0); it(1); }
 
diff --git a/src/test/run-pass/foreign-fn-with-byval.rs b/src/test/run-pass/foreign-fn-with-byval.rs
index 7883c22f909..d3d872620c3 100644
--- a/src/test/run-pass/foreign-fn-with-byval.rs
+++ b/src/test/run-pass/foreign-fn-with-byval.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 pub struct S {
diff --git a/src/test/run-pass/format-nan.rs b/src/test/run-pass/format-nan.rs
index bdbbeaa9511..9bbd8cdb11d 100644
--- a/src/test/run-pass/format-nan.rs
+++ b/src/test/run-pass/format-nan.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     use std::f64;
diff --git a/src/test/run-pass/format-ref-cell.rs b/src/test/run-pass/format-ref-cell.rs
index ce26fbd4c00..0f16dfa1e8f 100644
--- a/src/test/run-pass/format-ref-cell.rs
+++ b/src/test/run-pass/format-ref-cell.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::cell::RefCell;
 
diff --git a/src/test/run-pass/fsu-moves-and-copies.rs b/src/test/run-pass/fsu-moves-and-copies.rs
index fecaf279d04..dd58787a1de 100644
--- a/src/test/run-pass/fsu-moves-and-copies.rs
+++ b/src/test/run-pass/fsu-moves-and-copies.rs
@@ -11,7 +11,6 @@
 // Issue 4691: Ensure that functional-struct-updates operates
 // correctly and moves rather than copy when appropriate.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax, core)]
diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/run-pass/fun-call-variants.rs
index 0fe4bbcb7a2..3bb6df33f70 100644
--- a/src/test/run-pass/fun-call-variants.rs
+++ b/src/test/run-pass/fun-call-variants.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn ho<F>(f: F) -> isize where F: FnOnce(isize) -> isize { let n: isize = f(3); return n; }
 
diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/run-pass/fun-indirect-call.rs
index 48dfcb73da4..b28c64d06be 100644
--- a/src/test/run-pass/fun-indirect-call.rs
+++ b/src/test/run-pass/fun-indirect-call.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 fn f() -> isize { return 42; }
 
diff --git a/src/test/run-pass/func-arg-incomplete-pattern.rs b/src/test/run-pass/func-arg-incomplete-pattern.rs
index 28337237085..6030da44e4a 100644
--- a/src/test/run-pass/func-arg-incomplete-pattern.rs
+++ b/src/test/run-pass/func-arg-incomplete-pattern.rs
@@ -11,7 +11,6 @@
 // Test that we do not leak when the arg pattern must drop part of the
 // argument (in this case, the `y` field).
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/func-arg-ref-pattern.rs b/src/test/run-pass/func-arg-ref-pattern.rs
index fcc00afb00b..ab565e7abca 100644
--- a/src/test/run-pass/func-arg-ref-pattern.rs
+++ b/src/test/run-pass/func-arg-ref-pattern.rs
@@ -14,7 +14,6 @@
 // boxes. Make sure that we don't free the box as we match the
 // pattern.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/func-arg-wild-pattern.rs b/src/test/run-pass/func-arg-wild-pattern.rs
index 4f74ca0ff72..3ab3ee4db2d 100644
--- a/src/test/run-pass/func-arg-wild-pattern.rs
+++ b/src/test/run-pass/func-arg-wild-pattern.rs
@@ -11,7 +11,6 @@
 // Test that we can compile code that uses a `_` in function argument
 // patterns.
 
-// pretty-expanded FIXME #23616
 
 fn foo((x, _): (isize, isize)) -> isize {
     x
diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/run-pass/generic-exterior-unique.rs
index 0e3ce3869bf..8dbe6de8388 100644
--- a/src/test/run-pass/generic-exterior-unique.rs
+++ b/src/test/run-pass/generic-exterior-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/generic-extern-mangle.rs b/src/test/run-pass/generic-extern-mangle.rs
index 7a765703e23..67aea1f9f8a 100644
--- a/src/test/run-pass/generic-extern-mangle.rs
+++ b/src/test/run-pass/generic-extern-mangle.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs
index e01f5073722..181e05183d2 100644
--- a/src/test/run-pass/generic-fn-infer.rs
+++ b/src/test/run-pass/generic-fn-infer.rs
@@ -13,7 +13,6 @@
 
 
 // Issue #45: infer type parameters in function applications
-// pretty-expanded FIXME #23616
 
 fn id<T>(x: T) -> T { return x; }
 
diff --git a/src/test/run-pass/generic-object.rs b/src/test/run-pass/generic-object.rs
index 44b32f62f92..0a59a925a5f 100644
--- a/src/test/run-pass/generic-object.rs
+++ b/src/test/run-pass/generic-object.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/generic-static-methods.rs b/src/test/run-pass/generic-static-methods.rs
index 49f8d6a3adb..7a496ebf8ce 100644
--- a/src/test/run-pass/generic-static-methods.rs
+++ b/src/test/run-pass/generic-static-methods.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait vec_utils<T> {
     fn map_<U, F>(x: &Self, f: F) -> Vec<U> where F: FnMut(&T) -> U;
diff --git a/src/test/run-pass/generic-type.rs b/src/test/run-pass/generic-type.rs
index 73fc3a0d802..8e7a3add343 100644
--- a/src/test/run-pass/generic-type.rs
+++ b/src/test/run-pass/generic-type.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 struct Pair<T> {x: T, y: T}
 
diff --git a/src/test/run-pass/generic-unique.rs b/src/test/run-pass/generic-unique.rs
index 9cf98364eb9..21e9a9a80d0 100644
--- a/src/test/run-pass/generic-unique.rs
+++ b/src/test/run-pass/generic-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/getopts_ref.rs b/src/test/run-pass/getopts_ref.rs
index 52b06ab2928..c9595d09e21 100644
--- a/src/test/run-pass/getopts_ref.rs
+++ b/src/test/run-pass/getopts_ref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/global-scope.rs b/src/test/run-pass/global-scope.rs
index 64d9368a88b..13da404c253 100644
--- a/src/test/run-pass/global-scope.rs
+++ b/src/test/run-pass/global-scope.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn f() -> isize { return 1; }
 
diff --git a/src/test/run-pass/guards-not-exhaustive.rs b/src/test/run-pass/guards-not-exhaustive.rs
index f5f80914937..53c3eff5b81 100644
--- a/src/test/run-pass/guards-not-exhaustive.rs
+++ b/src/test/run-pass/guards-not-exhaustive.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 enum Q { R(Option<usize>) }
diff --git a/src/test/run-pass/guards.rs b/src/test/run-pass/guards.rs
index 11c67b8af81..d79dbabac2d 100644
--- a/src/test/run-pass/guards.rs
+++ b/src/test/run-pass/guards.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 struct Pair { x: isize, y: isize }
diff --git a/src/test/run-pass/hrtb-fn-like-trait-object.rs b/src/test/run-pass/hrtb-fn-like-trait-object.rs
index 858179fb5fe..8e2e21bed0a 100644
--- a/src/test/run-pass/hrtb-fn-like-trait-object.rs
+++ b/src/test/run-pass/hrtb-fn-like-trait-object.rs
@@ -10,7 +10,6 @@
 
 // A basic test of using a higher-ranked trait bound.
 
-// pretty-expanded FIXME #23616
 
 trait FnLike<A,R> {
     fn call(&self, arg: A) -> R;
diff --git a/src/test/run-pass/hrtb-fn-like-trait.rs b/src/test/run-pass/hrtb-fn-like-trait.rs
index 8b4c2aec845..71e314b5132 100644
--- a/src/test/run-pass/hrtb-fn-like-trait.rs
+++ b/src/test/run-pass/hrtb-fn-like-trait.rs
@@ -10,7 +10,6 @@
 
 // A basic test of using a higher-ranked trait bound.
 
-// pretty-expanded FIXME #23616
 
 trait FnLike<A,R> {
     fn call(&self, arg: A) -> R;
diff --git a/src/test/run-pass/hrtb-trait-object-paren-notation.rs b/src/test/run-pass/hrtb-trait-object-paren-notation.rs
index 7741f1904f6..fefbd004766 100644
--- a/src/test/run-pass/hrtb-trait-object-paren-notation.rs
+++ b/src/test/run-pass/hrtb-trait-object-paren-notation.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/huge-largest-array.rs b/src/test/run-pass/huge-largest-array.rs
index 2345bb01d8a..f0bb31b8470 100644
--- a/src/test/run-pass/huge-largest-array.rs
+++ b/src/test/run-pass/huge-largest-array.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::size_of;
 
diff --git a/src/test/run-pass/hygiene-dodging-1.rs b/src/test/run-pass/hygiene-dodging-1.rs
index e5acc4a2edd..83f09850f77 100644
--- a/src/test/run-pass/hygiene-dodging-1.rs
+++ b/src/test/run-pass/hygiene-dodging-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod x {
     pub fn g() -> usize {14}
diff --git a/src/test/run-pass/hygienic-labels.rs b/src/test/run-pass/hygienic-labels.rs
index 2d530275ea2..df72a5410a2 100644
--- a/src/test/run-pass/hygienic-labels.rs
+++ b/src/test/run-pass/hygienic-labels.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! loop_x {
     ($e: expr) => {
diff --git a/src/test/run-pass/i32-sub.rs b/src/test/run-pass/i32-sub.rs
index 2cc4e880bbf..075faba2fcb 100644
--- a/src/test/run-pass/i32-sub.rs
+++ b/src/test/run-pass/i32-sub.rs
@@ -11,6 +11,5 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() { let mut x: i32 = -400; x = 0 - x; assert!((x == 400)); }
diff --git a/src/test/run-pass/i8-incr.rs b/src/test/run-pass/i8-incr.rs
index 5dd53a268b1..242cea264af 100644
--- a/src/test/run-pass/i8-incr.rs
+++ b/src/test/run-pass/i8-incr.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut x: i8 = -12;
diff --git a/src/test/run-pass/if-let.rs b/src/test/run-pass/if-let.rs
index c41d02f9b33..13134abd8fd 100644
--- a/src/test/run-pass/if-let.rs
+++ b/src/test/run-pass/if-let.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = Some(3);
diff --git a/src/test/run-pass/impl-inherent-non-conflict.rs b/src/test/run-pass/impl-inherent-non-conflict.rs
index 210bc34bcd1..0d43f1ca706 100644
--- a/src/test/run-pass/impl-inherent-non-conflict.rs
+++ b/src/test/run-pass/impl-inherent-non-conflict.rs
@@ -12,7 +12,6 @@
 // with the same name, which can be called on values that have a
 // precise enough type to allow distinguishing between the methods.
 
-// pretty-expanded FIXME #23616
 
 struct Foo<T>(T);
 
diff --git a/src/test/run-pass/impl-inherent-prefer-over-trait.rs b/src/test/run-pass/impl-inherent-prefer-over-trait.rs
index 26f12e9730b..f0195976aa8 100644
--- a/src/test/run-pass/impl-inherent-prefer-over-trait.rs
+++ b/src/test/run-pass/impl-inherent-prefer-over-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo;
 
diff --git a/src/test/run-pass/impl-not-adjacent-to-type.rs b/src/test/run-pass/impl-not-adjacent-to-type.rs
index 2ba7375d67a..beba056b72c 100644
--- a/src/test/run-pass/impl-not-adjacent-to-type.rs
+++ b/src/test/run-pass/impl-not-adjacent-to-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod foo {
     pub struct Point {
diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs
index eb9ec6fe985..b2a9b08b01b 100644
--- a/src/test/run-pass/import-glob-crate.rs
+++ b/src/test/run-pass/import-glob-crate.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
 
diff --git a/src/test/run-pass/inferred-suffix-in-pattern-range.rs b/src/test/run-pass/inferred-suffix-in-pattern-range.rs
index fcbd4b33231..22369c77ed3 100644
--- a/src/test/run-pass/inferred-suffix-in-pattern-range.rs
+++ b/src/test/run-pass/inferred-suffix-in-pattern-range.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = 2;
diff --git a/src/test/run-pass/inherent-trait-method-order.rs b/src/test/run-pass/inherent-trait-method-order.rs
index 042268435c7..5489a61f7d0 100644
--- a/src/test/run-pass/inherent-trait-method-order.rs
+++ b/src/test/run-pass/inherent-trait-method-order.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo;
 
diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/run-pass/init-res-into-things.rs
index eb50fbed774..97b32189d00 100644
--- a/src/test/run-pass/init-res-into-things.rs
+++ b/src/test/run-pass/init-res-into-things.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/inner-attrs-on-impl.rs b/src/test/run-pass/inner-attrs-on-impl.rs
index a807e582ff4..d8d9d5136e2 100644
--- a/src/test/run-pass/inner-attrs-on-impl.rs
+++ b/src/test/run-pass/inner-attrs-on-impl.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 struct Foo;
 
diff --git a/src/test/run-pass/inner-static.rs b/src/test/run-pass/inner-static.rs
index 48f2006ed59..b93ca943e47 100644
--- a/src/test/run-pass/inner-static.rs
+++ b/src/test/run-pass/inner-static.rs
@@ -10,7 +10,6 @@
 
 // aux-build:inner_static.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate inner_static;
 
diff --git a/src/test/run-pass/integer-literal-radix.rs b/src/test/run-pass/integer-literal-radix.rs
index b782925fa93..ba9d22f06a9 100644
--- a/src/test/run-pass/integer-literal-radix.rs
+++ b/src/test/run-pass/integer-literal-radix.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let a = 0xBEEF_isize;
diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs
index 44dd191eb3e..fa97ef8fcd3 100644
--- a/src/test/run-pass/intrinsic-alignment.rs
+++ b/src/test/run-pass/intrinsic-alignment.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(intrinsics, main)]
 
diff --git a/src/test/run-pass/intrinsic-assume.rs b/src/test/run-pass/intrinsic-assume.rs
index fc886d7e301..ff7d799f64c 100644
--- a/src/test/run-pass/intrinsic-assume.rs
+++ b/src/test/run-pass/intrinsic-assume.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/run-pass/intrinsic-atomics-cc.rs
index c5fe02b9190..abb85cc7f19 100644
--- a/src/test/run-pass/intrinsic-atomics-cc.rs
+++ b/src/test/run-pass/intrinsic-atomics-cc.rs
@@ -10,7 +10,6 @@
 
 // aux-build:cci_intrinsic.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate cci_intrinsic;
 use cci_intrinsic::atomic_xchg;
diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/run-pass/intrinsic-atomics.rs
index 61a9f6109a3..4ccab55e943 100644
--- a/src/test/run-pass/intrinsic-atomics.rs
+++ b/src/test/run-pass/intrinsic-atomics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/intrinsic-move-val.rs b/src/test/run-pass/intrinsic-move-val.rs
index 98f069f77f3..2e75f2dccd1 100644
--- a/src/test/run-pass/intrinsic-move-val.rs
+++ b/src/test/run-pass/intrinsic-move-val.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/intrinsic-return-address.rs b/src/test/run-pass/intrinsic-return-address.rs
index 1ff910356eb..63aed3f009f 100644
--- a/src/test/run-pass/intrinsic-return-address.rs
+++ b/src/test/run-pass/intrinsic-return-address.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(intrinsics)]
 
diff --git a/src/test/run-pass/intrinsic-unreachable.rs b/src/test/run-pass/intrinsic-unreachable.rs
index 86a370a0942..a86fc110ae4 100644
--- a/src/test/run-pass/intrinsic-unreachable.rs
+++ b/src/test/run-pass/intrinsic-unreachable.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs
index 15dbe796ef5..f1d731c8b1d 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics-integer.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(negate_unsigned)]
 #![feature(intrinsics)]
diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/run-pass/intrinsics-math.rs
index 841ff297a2a..8db29ebaa6d 100644
--- a/src/test/run-pass/intrinsics-math.rs
+++ b/src/test/run-pass/intrinsics-math.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(intrinsics, core)]
 
diff --git a/src/test/run-pass/issue-10392.rs b/src/test/run-pass/issue-10392.rs
index 2d695c75d30..1a5f423b0fd 100644
--- a/src/test/run-pass/issue-10392.rs
+++ b/src/test/run-pass/issue-10392.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct A { foo: isize }
 struct B { a: isize, b: isize, c: isize }
diff --git a/src/test/run-pass/issue-10734.rs b/src/test/run-pass/issue-10734.rs
index 49694f2755c..c99cad85ccb 100644
--- a/src/test/run-pass/issue-10734.rs
+++ b/src/test/run-pass/issue-10734.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_no_drop_flag)]
 
diff --git a/src/test/run-pass/issue-10802.rs b/src/test/run-pass/issue-10802.rs
index bb322635094..2256315a379 100644
--- a/src/test/run-pass/issue-10802.rs
+++ b/src/test/run-pass/issue-10802.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/issue-1112.rs b/src/test/run-pass/issue-1112.rs
index 3d131b51033..72d1a43e883 100644
--- a/src/test/run-pass/issue-1112.rs
+++ b/src/test/run-pass/issue-1112.rs
@@ -11,7 +11,6 @@
 // Issue #1112
 // Alignment of interior pointers to dynamic-size types
 
-// pretty-expanded FIXME #23616
 
 struct X<T> {
     a: T,
diff --git a/src/test/run-pass/issue-11552.rs b/src/test/run-pass/issue-11552.rs
index 1f91c6aaa4d..5193330a45a 100644
--- a/src/test/run-pass/issue-11552.rs
+++ b/src/test/run-pass/issue-11552.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/issue-11577.rs b/src/test/run-pass/issue-11577.rs
index ecb7a3a3691..81588e8ef78 100644
--- a/src/test/run-pass/issue-11577.rs
+++ b/src/test/run-pass/issue-11577.rs
@@ -1,4 +1,3 @@
-// pretty-expanded FIXME #23616
 
  // Copyright 2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
diff --git a/src/test/run-pass/issue-11677.rs b/src/test/run-pass/issue-11677.rs
index a3eec42831f..d4244d44439 100644
--- a/src/test/run-pass/issue-11677.rs
+++ b/src/test/run-pass/issue-11677.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/issue-11940.rs b/src/test/run-pass/issue-11940.rs
index 8732def0a1a..186446a3456 100644
--- a/src/test/run-pass/issue-11940.rs
+++ b/src/test/run-pass/issue-11940.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const TEST_STR: &'static str = "abcd";
 
diff --git a/src/test/run-pass/issue-12285.rs b/src/test/run-pass/issue-12285.rs
index 3a5b7e86920..fb98909eb97 100644
--- a/src/test/run-pass/issue-12285.rs
+++ b/src/test/run-pass/issue-12285.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct S;
 
diff --git a/src/test/run-pass/issue-12677.rs b/src/test/run-pass/issue-12677.rs
index 493bdb30e35..e83a2e9727d 100644
--- a/src/test/run-pass/issue-12677.rs
+++ b/src/test/run-pass/issue-12677.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let s = "Hello";
diff --git a/src/test/run-pass/issue-13204.rs b/src/test/run-pass/issue-13204.rs
index ec9d777974b..36f606e5d73 100644
--- a/src/test/run-pass/issue-13204.rs
+++ b/src/test/run-pass/issue-13204.rs
@@ -11,7 +11,6 @@
 // Test that when instantiating trait default methods, typeck handles
 // lifetime parameters defined on the method bound correctly.
 
-// pretty-expanded FIXME #23616
 
 pub trait Foo {
     fn bar<'a, I: Iterator<Item=&'a ()>>(&self, it: I) -> usize {
diff --git a/src/test/run-pass/issue-13323.rs b/src/test/run-pass/issue-13323.rs
index 90d16aaf145..68c6ce7a7b7 100644
--- a/src/test/run-pass/issue-13323.rs
+++ b/src/test/run-pass/issue-13323.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/issue-13507-2.rs b/src/test/run-pass/issue-13507-2.rs
index 0b35ccf26f3..91ec3e85404 100644
--- a/src/test/run-pass/issue-13507-2.rs
+++ b/src/test/run-pass/issue-13507-2.rs
@@ -10,7 +10,6 @@
 
 // aux-build:issue13507.rs
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-13867.rs b/src/test/run-pass/issue-13867.rs
index a902e141bb6..e21070e2eaf 100644
--- a/src/test/run-pass/issue-13867.rs
+++ b/src/test/run-pass/issue-13867.rs
@@ -11,7 +11,6 @@
 // Test that codegen works correctly when there are multiple refutable
 // patterns in match expression.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     FooUint(usize),
diff --git a/src/test/run-pass/issue-14308.rs b/src/test/run-pass/issue-14308.rs
index f67d0946e98..a61cb18faa6 100644
--- a/src/test/run-pass/issue-14308.rs
+++ b/src/test/run-pass/issue-14308.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct A(isize);
 struct B;
diff --git a/src/test/run-pass/issue-14456.rs b/src/test/run-pass/issue-14456.rs
index ab9633ca1fe..7e24c8f73ab 100644
--- a/src/test/run-pass/issue-14456.rs
+++ b/src/test/run-pass/issue-14456.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(io, process_capture)]
 
diff --git a/src/test/run-pass/issue-14865.rs b/src/test/run-pass/issue-14865.rs
index e78736b77fd..1ec268bb170 100644
--- a/src/test/run-pass/issue-14865.rs
+++ b/src/test/run-pass/issue-14865.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum X {
     Foo(usize),
diff --git a/src/test/run-pass/issue-14936.rs b/src/test/run-pass/issue-14936.rs
index 2361c385b41..5f8e7cb8145 100644
--- a/src/test/run-pass/issue-14936.rs
+++ b/src/test/run-pass/issue-14936.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(asm)]
 
diff --git a/src/test/run-pass/issue-14940.rs b/src/test/run-pass/issue-14940.rs
index a530384d368..b51afc1d020 100644
--- a/src/test/run-pass/issue-14940.rs
+++ b/src/test/run-pass/issue-14940.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(old_io, io)]
 
diff --git a/src/test/run-pass/issue-15080.rs b/src/test/run-pass/issue-15080.rs
index 4369dc6292c..ecb83cca6f2 100644
--- a/src/test/run-pass/issue-15080.rs
+++ b/src/test/run-pass/issue-15080.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/issue-15104.rs b/src/test/run-pass/issue-15104.rs
index db04e10cfe3..b55754ee59b 100644
--- a/src/test/run-pass/issue-15104.rs
+++ b/src/test/run-pass/issue-15104.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/issue-15129.rs b/src/test/run-pass/issue-15129.rs
index 54705c6bf13..9bcfa6ea40a 100644
--- a/src/test/run-pass/issue-15129.rs
+++ b/src/test/run-pass/issue-15129.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub enum T {
     T1(()),
diff --git a/src/test/run-pass/issue-15149.rs b/src/test/run-pass/issue-15149.rs
index ee348d9cb0c..f6ffd03c81a 100644
--- a/src/test/run-pass/issue-15149.rs
+++ b/src/test/run-pass/issue-15149.rs
@@ -10,7 +10,6 @@
 
 // no-prefer-dynamic
 
-// pretty-expanded FIXME #23616
 
 #![feature(fs, process, env, path, rand)]
 
diff --git a/src/test/run-pass/issue-15673.rs b/src/test/run-pass/issue-15673.rs
index c1ecd3eba48..c478ca04114 100644
--- a/src/test/run-pass/issue-15673.rs
+++ b/src/test/run-pass/issue-15673.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-15689-1.rs b/src/test/run-pass/issue-15689-1.rs
index 9fc1cce56b7..e3c16793c19 100644
--- a/src/test/run-pass/issue-15689-1.rs
+++ b/src/test/run-pass/issue-15689-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq)]
 enum Test<'a> {
diff --git a/src/test/run-pass/issue-15734.rs b/src/test/run-pass/issue-15734.rs
index 67ce6a1c44f..7f44c5a84cb 100644
--- a/src/test/run-pass/issue-15734.rs
+++ b/src/test/run-pass/issue-15734.rs
@@ -11,7 +11,6 @@
 // If `Index` used an associated type for its output, this test would
 // work more smoothly.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-15793.rs b/src/test/run-pass/issue-15793.rs
index 21baf47ee66..432174a1f52 100644
--- a/src/test/run-pass/issue-15793.rs
+++ b/src/test/run-pass/issue-15793.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum NestedEnum {
     First,
diff --git a/src/test/run-pass/issue-15858.rs b/src/test/run-pass/issue-15858.rs
index 265db3fe133..4f084d7891f 100644
--- a/src/test/run-pass/issue-15858.rs
+++ b/src/test/run-pass/issue-15858.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs b/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs
index 6b75e4e4797..2ec97e373b2 100644
--- a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs
+++ b/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs
@@ -10,7 +10,6 @@
 //
 // regression test for the model lexer handling the DOTDOTDOT syntax (#15877)
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match 5_usize {
diff --git a/src/test/run-pass/issue-16151.rs b/src/test/run-pass/issue-16151.rs
index 242bcb69be6..212dfaf3cb6 100644
--- a/src/test/run-pass/issue-16151.rs
+++ b/src/test/run-pass/issue-16151.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/issue-16530.rs b/src/test/run-pass/issue-16530.rs
index bf33221431a..77ec44161ea 100644
--- a/src/test/run-pass/issue-16530.rs
+++ b/src/test/run-pass/issue-16530.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(hash)]
 
diff --git a/src/test/run-pass/issue-16560.rs b/src/test/run-pass/issue-16560.rs
index 33842fab698..a9f7d86f95e 100644
--- a/src/test/run-pass/issue-16560.rs
+++ b/src/test/run-pass/issue-16560.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/issue-16596.rs b/src/test/run-pass/issue-16596.rs
index 743dbbc9b99..d70158743e7 100644
--- a/src/test/run-pass/issue-16596.rs
+++ b/src/test/run-pass/issue-16596.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait MatrixRow { fn dummy(&self) { }}
 
diff --git a/src/test/run-pass/issue-16648.rs b/src/test/run-pass/issue-16648.rs
index f0ff9ce7554..384bd9df7cf 100644
--- a/src/test/run-pass/issue-16648.rs
+++ b/src/test/run-pass/issue-16648.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/issue-16739.rs b/src/test/run-pass/issue-16739.rs
index 99ddaba4e55..f8cffdd38ca 100644
--- a/src/test/run-pass/issue-16739.rs
+++ b/src/test/run-pass/issue-16739.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/issue-16774.rs b/src/test/run-pass/issue-16774.rs
index 17d0969ce1c..627717ab1cd 100644
--- a/src/test/run-pass/issue-16774.rs
+++ b/src/test/run-pass/issue-16774.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/issue-1701.rs b/src/test/run-pass/issue-1701.rs
index b8c51f2cd31..3a2e46c62b0 100644
--- a/src/test/run-pass/issue-1701.rs
+++ b/src/test/run-pass/issue-1701.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum pattern { tabby, tortoiseshell, calico }
 enum breed { beagle, rottweiler, pug }
diff --git a/src/test/run-pass/issue-17068.rs b/src/test/run-pass/issue-17068.rs
index 55a6d4cdbac..91264b4ac3f 100644
--- a/src/test/run-pass/issue-17068.rs
+++ b/src/test/run-pass/issue-17068.rs
@@ -10,7 +10,6 @@
 
 // Test that regionck creates the right region links in the pattern
 // binding of a for loop
-// pretty-expanded FIXME #23616
 
 fn foo<'a>(v: &'a [usize]) -> &'a usize {
     for &ref x in v { return x; }
diff --git a/src/test/run-pass/issue-17074.rs b/src/test/run-pass/issue-17074.rs
index 08c313ab0a4..ec2d8f79781 100644
--- a/src/test/run-pass/issue-17074.rs
+++ b/src/test/run-pass/issue-17074.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static X2: u64 = !0 as u16 as u64;
 static Y2: u64 = !0 as u32 as u64;
diff --git a/src/test/run-pass/issue-17216.rs b/src/test/run-pass/issue-17216.rs
index f17834e8d36..6a8f7d992a2 100644
--- a/src/test/run-pass/issue-17216.rs
+++ b/src/test/run-pass/issue-17216.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/issue-17233.rs b/src/test/run-pass/issue-17233.rs
index 756822d4f45..e9f0c73e29d 100644
--- a/src/test/run-pass/issue-17233.rs
+++ b/src/test/run-pass/issue-17233.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const X1: &'static [u8] = &[b'1'];
 const X2: &'static [u8] = b"1";
diff --git a/src/test/run-pass/issue-17302.rs b/src/test/run-pass/issue-17302.rs
index 35bd07c896b..59625581167 100644
--- a/src/test/run-pass/issue-17302.rs
+++ b/src/test/run-pass/issue-17302.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static mut DROPPED: [bool; 2] = [false, false];
 
diff --git a/src/test/run-pass/issue-17662.rs b/src/test/run-pass/issue-17662.rs
index 36e12b96c87..320d108cfae 100644
--- a/src/test/run-pass/issue-17662.rs
+++ b/src/test/run-pass/issue-17662.rs
@@ -10,7 +10,6 @@
 
 // aux-build:issue-17662.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate issue_17662 as i;
 
diff --git a/src/test/run-pass/issue-17718-parse-const.rs b/src/test/run-pass/issue-17718-parse-const.rs
index 1fc8f3274d4..9be92d65978 100644
--- a/src/test/run-pass/issue-17718-parse-const.rs
+++ b/src/test/run-pass/issue-17718-parse-const.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const FOO: usize = 3;
 
diff --git a/src/test/run-pass/issue-17718.rs b/src/test/run-pass/issue-17718.rs
index 13e082eada8..2b84ce71dd2 100644
--- a/src/test/run-pass/issue-17718.rs
+++ b/src/test/run-pass/issue-17718.rs
@@ -10,7 +10,6 @@
 
 // aux-build:issue-17718.rs
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-17734.rs b/src/test/run-pass/issue-17734.rs
index 3cf9c62b40d..0fc8eea778d 100644
--- a/src/test/run-pass/issue-17734.rs
+++ b/src/test/run-pass/issue-17734.rs
@@ -10,7 +10,6 @@
 
 // Test that generating drop glue for Box<str> doesn't ICE
 
-// pretty-expanded FIXME #23616
 
 fn f(s: Box<str>) -> Box<str> {
     s
diff --git a/src/test/run-pass/issue-17877.rs b/src/test/run-pass/issue-17877.rs
index 41fab9d9d54..6c87e8d35fb 100644
--- a/src/test/run-pass/issue-17877.rs
+++ b/src/test/run-pass/issue-17877.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/issue-18352.rs b/src/test/run-pass/issue-18352.rs
index 4e60a7d9b5f..cce6ba407a6 100644
--- a/src/test/run-pass/issue-18352.rs
+++ b/src/test/run-pass/issue-18352.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const X: &'static str = "12345";
 
diff --git a/src/test/run-pass/issue-18412.rs b/src/test/run-pass/issue-18412.rs
index 41dacd33203..1017fab5ae2 100644
--- a/src/test/run-pass/issue-18412.rs
+++ b/src/test/run-pass/issue-18412.rs
@@ -11,7 +11,6 @@
 // Test that non-static methods can be assigned to local variables as
 // function pointers.
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn foo(&self) -> usize;
diff --git a/src/test/run-pass/issue-18652.rs b/src/test/run-pass/issue-18652.rs
index a3affb7bf86..8ab645e54ad 100644
--- a/src/test/run-pass/issue-18652.rs
+++ b/src/test/run-pass/issue-18652.rs
@@ -12,7 +12,6 @@
 // once closure as an optimization by trans.  This used to hit an
 // incorrect assert.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/issue-18767.rs b/src/test/run-pass/issue-18767.rs
index 8e51a900c0c..264985b791e 100644
--- a/src/test/run-pass/issue-18767.rs
+++ b/src/test/run-pass/issue-18767.rs
@@ -11,7 +11,6 @@
 // Test that regionck uses the right memcat for patterns in for loops
 // and doesn't ICE.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     for &&x in Some(&0_usize).iter() {
diff --git a/src/test/run-pass/issue-18859.rs b/src/test/run-pass/issue-18859.rs
index 16e6c99f0e3..7c7501d3420 100644
--- a/src/test/run-pass/issue-18859.rs
+++ b/src/test/run-pass/issue-18859.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod foo {
     pub mod bar {
diff --git a/src/test/run-pass/issue-19244.rs b/src/test/run-pass/issue-19244.rs
index f25450a8918..92ac2e37b90 100644
--- a/src/test/run-pass/issue-19244.rs
+++ b/src/test/run-pass/issue-19244.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct MyStruct { field: usize }
 struct Nested { nested: MyStruct }
diff --git a/src/test/run-pass/issue-19811-escape-unicode.rs b/src/test/run-pass/issue-19811-escape-unicode.rs
index 5b415c63885..e6e9bf6e636 100644
--- a/src/test/run-pass/issue-19811-escape-unicode.rs
+++ b/src/test/run-pass/issue-19811-escape-unicode.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/issue-21058.rs b/src/test/run-pass/issue-21058.rs
index d7a656be7af..c384757c5e4 100644
--- a/src/test/run-pass/issue-21058.rs
+++ b/src/test/run-pass/issue-21058.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-21306.rs b/src/test/run-pass/issue-21306.rs
index cabda0b500b..bc2c7f09374 100644
--- a/src/test/run-pass/issue-21306.rs
+++ b/src/test/run-pass/issue-21306.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::Arc;
 
diff --git a/src/test/run-pass/issue-21361.rs b/src/test/run-pass/issue-21361.rs
index ef86634125e..b89e07ef31f 100644
--- a/src/test/run-pass/issue-21361.rs
+++ b/src/test/run-pass/issue-21361.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let v = vec![1, 2, 3];
diff --git a/src/test/run-pass/issue-21384.rs b/src/test/run-pass/issue-21384.rs
index 41a9ca840b1..e10fcd30b99 100644
--- a/src/test/run-pass/issue-21384.rs
+++ b/src/test/run-pass/issue-21384.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use ::std::ops::RangeFull;
 
diff --git a/src/test/run-pass/issue-21634.rs b/src/test/run-pass/issue-21634.rs
index fe540e1aabe..2a146ae8fcf 100644
--- a/src/test/run-pass/issue-21634.rs
+++ b/src/test/run-pass/issue-21634.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     if let Ok(x) = "3.1415".parse::<f64>() {
diff --git a/src/test/run-pass/issue-21655.rs b/src/test/run-pass/issue-21655.rs
index cb87770c565..bf01873bea5 100644
--- a/src/test/run-pass/issue-21655.rs
+++ b/src/test/run-pass/issue-21655.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test(it: &mut Iterator<Item=i32>) {
     for x in it {
diff --git a/src/test/run-pass/issue-21721.rs b/src/test/run-pass/issue-21721.rs
index c34ab1b0ea7..d1fc61ff6a5 100644
--- a/src/test/run-pass/issue-21721.rs
+++ b/src/test/run-pass/issue-21721.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     static NONE: Option<((), &'static u8)> = None;
diff --git a/src/test/run-pass/issue-22036.rs b/src/test/run-pass/issue-22036.rs
index e02ce5441a7..43fb286f0ec 100644
--- a/src/test/run-pass/issue-22036.rs
+++ b/src/test/run-pass/issue-22036.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait DigitCollection: Sized {
     type Iter: Iterator<Item = u8>;
diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs
index 38895e1414c..775cfb0ee42 100644
--- a/src/test/run-pass/issue-2214.rs
+++ b/src/test/run-pass/issue-2214.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(libc)]
 
diff --git a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs b/src/test/run-pass/issue-22536-copy-mustnt-zero.rs
index 8a0f04a2cf0..af99b11c253 100644
--- a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs
+++ b/src/test/run-pass/issue-22536-copy-mustnt-zero.rs
@@ -11,7 +11,6 @@
 // Regression test for Issue #22536: If a type implements Copy, then
 // moving it must not zero the original memory.
 
-// pretty-expanded FIXME #23616
 
 trait Resources {
     type Buffer: Copy;
diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs
index c76bbaf968a..a47c1512552 100644
--- a/src/test/run-pass/issue-2311-2.rs
+++ b/src/test/run-pass/issue-2311-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait clam<A> {
     fn get(self) -> A;
diff --git a/src/test/run-pass/issue-2312.rs b/src/test/run-pass/issue-2312.rs
index fa056191e67..6f479c62117 100644
--- a/src/test/run-pass/issue-2312.rs
+++ b/src/test/run-pass/issue-2312.rs
@@ -10,7 +10,6 @@
 
 // Testing that the B's are resolved
 
-// pretty-expanded FIXME #23616
 
 trait clam<A> { fn get(self) -> A; }
 
diff --git a/src/test/run-pass/issue-2428.rs b/src/test/run-pass/issue-2428.rs
index 402eb0349ab..a07050d4582 100644
--- a/src/test/run-pass/issue-2428.rs
+++ b/src/test/run-pass/issue-2428.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _foo = 100;
diff --git a/src/test/run-pass/issue-2611-3.rs b/src/test/run-pass/issue-2611-3.rs
index 8cf80333e97..242528dcb14 100644
--- a/src/test/run-pass/issue-2611-3.rs
+++ b/src/test/run-pass/issue-2611-3.rs
@@ -11,7 +11,6 @@
 // Tests that impls are allowed to have looser, more permissive bounds
 // than the traits require.
 
-// pretty-expanded FIXME #23616
 
 trait A {
   fn b<C:Sync,D>(&self, x: C) -> C;
diff --git a/src/test/run-pass/issue-2735-2.rs b/src/test/run-pass/issue-2735-2.rs
index 1506b2d6bf0..36d7f4583b0 100644
--- a/src/test/run-pass/issue-2735-2.rs
+++ b/src/test/run-pass/issue-2735-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/issue-2735-3.rs b/src/test/run-pass/issue-2735-3.rs
index 2282334d66d..f438519b72f 100644
--- a/src/test/run-pass/issue-2735-3.rs
+++ b/src/test/run-pass/issue-2735-3.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/issue-2748-b.rs b/src/test/run-pass/issue-2748-b.rs
index 8f30d262f41..f1cbf11a347 100644
--- a/src/test/run-pass/issue-2748-b.rs
+++ b/src/test/run-pass/issue-2748-b.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn thing<'r>(x: &'r [isize]) -> &'r [isize] { x }
 
diff --git a/src/test/run-pass/issue-2895.rs b/src/test/run-pass/issue-2895.rs
index 3f4c630cc2b..93d9300edf6 100644
--- a/src/test/run-pass/issue-2895.rs
+++ b/src/test/run-pass/issue-2895.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/issue-2936.rs b/src/test/run-pass/issue-2936.rs
index 5c63230f5d0..c277073a79d 100644
--- a/src/test/run-pass/issue-2936.rs
+++ b/src/test/run-pass/issue-2936.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait bar<T> {
     fn get_bar(&self) -> T;
diff --git a/src/test/run-pass/issue-3091.rs b/src/test/run-pass/issue-3091.rs
index 8e59e46fc3c..c67399a89e9 100644
--- a/src/test/run-pass/issue-3091.rs
+++ b/src/test/run-pass/issue-3091.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = 1;
diff --git a/src/test/run-pass/issue-3290.rs b/src/test/run-pass/issue-3290.rs
index 3fa5b72c348..b09820146f5 100644
--- a/src/test/run-pass/issue-3290.rs
+++ b/src/test/run-pass/issue-3290.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/issue-333.rs b/src/test/run-pass/issue-333.rs
index b611f11a0a1..592ff0b02a4 100644
--- a/src/test/run-pass/issue-333.rs
+++ b/src/test/run-pass/issue-333.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn quux<T>(x: T) -> T { let f = id::<T>; return f(x); }
 
diff --git a/src/test/run-pass/issue-3574.rs b/src/test/run-pass/issue-3574.rs
index 9a521ba376d..9aac52fa2f8 100644
--- a/src/test/run-pass/issue-3574.rs
+++ b/src/test/run-pass/issue-3574.rs
@@ -10,7 +10,6 @@
 
 // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs
 
-// pretty-expanded FIXME #23616
 
 fn compare(x: &str, y: &str) -> bool {
     match x {
diff --git a/src/test/run-pass/issue-3895.rs b/src/test/run-pass/issue-3895.rs
index ca6d9faf88f..ffe14dab300 100644
--- a/src/test/run-pass/issue-3895.rs
+++ b/src/test/run-pass/issue-3895.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     enum State { BadChar, BadSyntax }
diff --git a/src/test/run-pass/issue-3935.rs b/src/test/run-pass/issue-3935.rs
index 1e200e01628..45ff20fc0a9 100644
--- a/src/test/run-pass/issue-3935.rs
+++ b/src/test/run-pass/issue-3935.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(PartialEq)]
 struct Bike {
diff --git a/src/test/run-pass/issue-3979-generics.rs b/src/test/run-pass/issue-3979-generics.rs
index 61708acf7f3..6ba566012c3 100644
--- a/src/test/run-pass/issue-3979-generics.rs
+++ b/src/test/run-pass/issue-3979-generics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Add;
 
diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/run-pass/issue-3979-xcrate.rs
index 0784877849a..acacc488566 100644
--- a/src/test/run-pass/issue-3979-xcrate.rs
+++ b/src/test/run-pass/issue-3979-xcrate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:issue_3979_traits.rs
-// pretty-expanded FIXME #23616
 
 extern crate issue_3979_traits;
 use issue_3979_traits::{Positioned, Movable};
diff --git a/src/test/run-pass/issue-3979.rs b/src/test/run-pass/issue-3979.rs
index 341866e4982..184682255d9 100644
--- a/src/test/run-pass/issue-3979.rs
+++ b/src/test/run-pass/issue-3979.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Positioned {
   fn SetX(&mut self, isize);
diff --git a/src/test/run-pass/issue-4016.rs b/src/test/run-pass/issue-4016.rs
index 122de97c99c..bc3fa162e02 100644
--- a/src/test/run-pass/issue-4016.rs
+++ b/src/test/run-pass/issue-4016.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/issue-4107.rs b/src/test/run-pass/issue-4107.rs
index 18025c315c9..fa5ed26847b 100644
--- a/src/test/run-pass/issue-4107.rs
+++ b/src/test/run-pass/issue-4107.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _id: &Mat2<f64> = &Matrix::identity(1.0);
diff --git a/src/test/run-pass/issue-4448.rs b/src/test/run-pass/issue-4448.rs
index d5d3122f683..eb411ff4417 100644
--- a/src/test/run-pass/issue-4448.rs
+++ b/src/test/run-pass/issue-4448.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::channel;
 use std::thread;
diff --git a/src/test/run-pass/issue-4734.rs b/src/test/run-pass/issue-4734.rs
index 82925852a6a..88a3b24d14f 100644
--- a/src/test/run-pass/issue-4734.rs
+++ b/src/test/run-pass/issue-4734.rs
@@ -11,7 +11,6 @@
 // Ensures that destructors are run for expressions of the form "e;" where
 // `e` is a type which requires a destructor.
 
-// pretty-expanded FIXME #23616
 
 #![allow(path_statement)]
 
diff --git a/src/test/run-pass/issue-5239-2.rs b/src/test/run-pass/issue-5239-2.rs
index d8491070bd8..5e58d76d5e0 100644
--- a/src/test/run-pass/issue-5239-2.rs
+++ b/src/test/run-pass/issue-5239-2.rs
@@ -10,7 +10,6 @@
 
 // Regression test for issue #5239
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _f = |ref x: isize| { *x };
diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs
index 4ad729f1bc6..136f7aa956c 100644
--- a/src/test/run-pass/issue-5521.rs
+++ b/src/test/run-pass/issue-5521.rs
@@ -11,7 +11,6 @@
 // aux-build:issue-5521.rs
 
 
-// pretty-expanded FIXME #23616
 
 extern crate issue_5521 as foo;
 
diff --git a/src/test/run-pass/issue-5530.rs b/src/test/run-pass/issue-5530.rs
index 50b9ca6e797..bd7d7af71df 100644
--- a/src/test/run-pass/issue-5530.rs
+++ b/src/test/run-pass/issue-5530.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Enum {
     Foo { foo: usize },
diff --git a/src/test/run-pass/issue-5917.rs b/src/test/run-pass/issue-5917.rs
index 7f741182f42..112ad0185d8 100644
--- a/src/test/run-pass/issue-5917.rs
+++ b/src/test/run-pass/issue-5917.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct T (&'static [isize]);
 static t : T = T (&[5, 4, 3]);
diff --git a/src/test/run-pass/issue-5997.rs b/src/test/run-pass/issue-5997.rs
index 48923bc82b4..0c41acf04aa 100644
--- a/src/test/run-pass/issue-5997.rs
+++ b/src/test/run-pass/issue-5997.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f<T>() -> bool {
     enum E<T> { V(T) }
diff --git a/src/test/run-pass/issue-6128.rs b/src/test/run-pass/issue-6128.rs
index baf829bc269..5fb24fe3ef1 100644
--- a/src/test/run-pass/issue-6128.rs
+++ b/src/test/run-pass/issue-6128.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax, collections)]
diff --git a/src/test/run-pass/issue-6130.rs b/src/test/run-pass/issue-6130.rs
index 6f158339169..f124b851f09 100644
--- a/src/test/run-pass/issue-6130.rs
+++ b/src/test/run-pass/issue-6130.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![deny(type_limits)]
 
diff --git a/src/test/run-pass/issue-6153.rs b/src/test/run-pass/issue-6153.rs
index c280ea31ebc..16e7060f4b9 100644
--- a/src/test/run-pass/issue-6153.rs
+++ b/src/test/run-pass/issue-6153.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn swap<F>(f: F) -> Vec<isize> where F: FnOnce(Vec<isize>) -> Vec<isize> {
     let x = vec!(1, 2, 3);
diff --git a/src/test/run-pass/issue-6334.rs b/src/test/run-pass/issue-6334.rs
index 2f2dca8fe22..fca1c296ddd 100644
--- a/src/test/run-pass/issue-6334.rs
+++ b/src/test/run-pass/issue-6334.rs
@@ -11,7 +11,6 @@
 // Tests that everything still compiles and runs fine even when
 // we reorder the bounds.
 
-// pretty-expanded FIXME #23616
 
 trait A {
     fn a(&self) -> usize;
diff --git a/src/test/run-pass/issue-6449.rs b/src/test/run-pass/issue-6449.rs
index 3b33a0ac86f..09a4e288404 100644
--- a/src/test/run-pass/issue-6449.rs
+++ b/src/test/run-pass/issue-6449.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     Bar(isize),
diff --git a/src/test/run-pass/issue-6892.rs b/src/test/run-pass/issue-6892.rs
index 4469dcc0ced..75420ad6ff1 100644
--- a/src/test/run-pass/issue-6892.rs
+++ b/src/test/run-pass/issue-6892.rs
@@ -11,7 +11,6 @@
 // Ensures that destructors are run for expressions of the form "let _ = e;"
 // where `e` is a type which requires a destructor.
 
-// pretty-expanded FIXME #23616
 
 struct Foo;
 struct Bar { x: isize }
diff --git a/src/test/run-pass/issue-7575.rs b/src/test/run-pass/issue-7575.rs
index 727ed91eadc..508ebf3f69d 100644
--- a/src/test/run-pass/issue-7575.rs
+++ b/src/test/run-pass/issue-7575.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn new() -> bool { false }
diff --git a/src/test/run-pass/issue-7663.rs b/src/test/run-pass/issue-7663.rs
index 007127aeae1..7aac8d44563 100644
--- a/src/test/run-pass/issue-7663.rs
+++ b/src/test/run-pass/issue-7663.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unused_imports, dead_code)]
 
diff --git a/src/test/run-pass/issue-7784.rs b/src/test/run-pass/issue-7784.rs
index e2016feeb0a..224fe627e32 100644
--- a/src/test/run-pass/issue-7784.rs
+++ b/src/test/run-pass/issue-7784.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(advanced_slice_patterns)]
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/issue-8351-1.rs b/src/test/run-pass/issue-8351-1.rs
index a11e14fb333..ed78b37604e 100644
--- a/src/test/run-pass/issue-8351-1.rs
+++ b/src/test/run-pass/issue-8351-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E {
     Foo{f: isize},
diff --git a/src/test/run-pass/issue-8351-2.rs b/src/test/run-pass/issue-8351-2.rs
index 7cf221926a6..1ed93915b8a 100644
--- a/src/test/run-pass/issue-8351-2.rs
+++ b/src/test/run-pass/issue-8351-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E {
     Foo{f: isize, b: bool},
diff --git a/src/test/run-pass/issue-8391.rs b/src/test/run-pass/issue-8391.rs
index bd2e2871bdb..b832c410443 100644
--- a/src/test/run-pass/issue-8391.rs
+++ b/src/test/run-pass/issue-8391.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let x = match Some(1) {
diff --git a/src/test/run-pass/issue-8460.rs b/src/test/run-pass/issue-8460.rs
index 7d8c4ab210d..2469dec9947 100644
--- a/src/test/run-pass/issue-8460.rs
+++ b/src/test/run-pass/issue-8460.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/issue-8498.rs b/src/test/run-pass/issue-8498.rs
index 825729b1e2a..fae3352f9cc 100644
--- a/src/test/run-pass/issue-8498.rs
+++ b/src/test/run-pass/issue-8498.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match &[(Box::new(5),Box::new(7))] {
diff --git a/src/test/run-pass/issue-8709.rs b/src/test/run-pass/issue-8709.rs
index 64672629298..44759cef286 100644
--- a/src/test/run-pass/issue-8709.rs
+++ b/src/test/run-pass/issue-8709.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! sty {
     ($t:ty) => (stringify!($t))
diff --git a/src/test/run-pass/issue-8860.rs b/src/test/run-pass/issue-8860.rs
index 8024eaeda83..ff562aac161 100644
--- a/src/test/run-pass/issue-8860.rs
+++ b/src/test/run-pass/issue-8860.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static mut DROP: isize = 0;
 static mut DROP_S: isize = 0;
diff --git a/src/test/run-pass/issue-8898.rs b/src/test/run-pass/issue-8898.rs
index a4cad1b2639..065cef2c60d 100644
--- a/src/test/run-pass/issue-8898.rs
+++ b/src/test/run-pass/issue-8898.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn assert_repr_eq<T: std::fmt::Debug>(obj : T, expected : String) {
     assert_eq!(expected, format!("{:?}", obj));
diff --git a/src/test/run-pass/issue-9188.rs b/src/test/run-pass/issue-9188.rs
index 0bd8a8e0d9d..e2272837efb 100644
--- a/src/test/run-pass/issue-9188.rs
+++ b/src/test/run-pass/issue-9188.rs
@@ -10,7 +10,6 @@
 
 // aux-build:issue_9188.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate issue_9188;
 
diff --git a/src/test/run-pass/issue-9259.rs b/src/test/run-pass/issue-9259.rs
index 209c6b13961..996548de817 100644
--- a/src/test/run-pass/issue-9259.rs
+++ b/src/test/run-pass/issue-9259.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct A<'a> {
     a: &'a [String],
diff --git a/src/test/run-pass/issue-9394-inherited-trait-calls.rs b/src/test/run-pass/issue-9394-inherited-trait-calls.rs
index 148d0760e5c..7d2c435b384 100644
--- a/src/test/run-pass/issue-9394-inherited-trait-calls.rs
+++ b/src/test/run-pass/issue-9394-inherited-trait-calls.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Base: Base2 + Base3{
     fn foo(&self) -> String;
diff --git a/src/test/run-pass/issue-979.rs b/src/test/run-pass/issue-979.rs
index 3283dc44f30..979abcef7b8 100644
--- a/src/test/run-pass/issue-979.rs
+++ b/src/test/run-pass/issue-979.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/issue-9918.rs b/src/test/run-pass/issue-9918.rs
index e81a07fa683..a766e6b707e 100644
--- a/src/test/run-pass/issue-9918.rs
+++ b/src/test/run-pass/issue-9918.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert_eq!((0 + 0u8) as char, '\0');
diff --git a/src/test/run-pass/iter-cloned-type-inference.rs b/src/test/run-pass/iter-cloned-type-inference.rs
index d1f63564979..59f7569d8c6 100644
--- a/src/test/run-pass/iter-cloned-type-inference.rs
+++ b/src/test/run-pass/iter-cloned-type-inference.rs
@@ -11,7 +11,6 @@
 // Test to see that the element type of .cloned() can be inferred
 // properly. Previously this would fail to deduce the type of `sum`.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/run-pass/kindck-owned-trait-contains-1.rs
index 84156385ef4..9df72f4760a 100644
--- a/src/test/run-pass/kindck-owned-trait-contains-1.rs
+++ b/src/test/run-pass/kindck-owned-trait-contains-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/run-pass/last-use-in-block.rs
index 28fe3bf0bd1..a2b01f29ae1 100644
--- a/src/test/run-pass/last-use-in-block.rs
+++ b/src/test/run-pass/last-use-in-block.rs
@@ -10,7 +10,6 @@
 
 // Issue #1818
 
-// pretty-expanded FIXME #23616
 
 fn lp<T, F>(s: String, mut f: F) -> T where F: FnMut(String) -> T {
     while false {
diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/run-pass/last-use-in-cap-clause.rs
index f9c8fe0f2d2..f196899f69d 100644
--- a/src/test/run-pass/last-use-in-cap-clause.rs
+++ b/src/test/run-pass/last-use-in-cap-clause.rs
@@ -10,7 +10,6 @@
 
 // Make sure #1399 stays fixed
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/let-destruct-ref.rs b/src/test/run-pass/let-destruct-ref.rs
index 0b38d16941b..c9504f87c49 100644
--- a/src/test/run-pass/let-destruct-ref.rs
+++ b/src/test/run-pass/let-destruct-ref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = 3_usize;
diff --git a/src/test/run-pass/let-var-hygiene.rs b/src/test/run-pass/let-var-hygiene.rs
index c1e80aaf2d7..d9087f58bef 100644
--- a/src/test/run-pass/let-var-hygiene.rs
+++ b/src/test/run-pass/let-var-hygiene.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // shouldn't affect evaluation of $ex:
-// pretty-expanded FIXME #23616
 
 macro_rules! bad_macro {
     ($ex:expr) => ({let _x = 9; $ex})
diff --git a/src/test/run-pass/logging-enabled-debug.rs b/src/test/run-pass/logging-enabled-debug.rs
index 59f5b0af359..3ae4884ce47 100644
--- a/src/test/run-pass/logging-enabled-debug.rs
+++ b/src/test/run-pass/logging-enabled-debug.rs
@@ -11,7 +11,6 @@
 // compile-flags:-C debug-assertions=no
 // exec-env:RUST_LOG=logging-enabled-debug=debug
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/logging-enabled.rs b/src/test/run-pass/logging-enabled.rs
index 294d4d12179..2975835a271 100644
--- a/src/test/run-pass/logging-enabled.rs
+++ b/src/test/run-pass/logging-enabled.rs
@@ -10,7 +10,6 @@
 
 // exec-env:RUST_LOG=logging_enabled=info
 
-// pretty-expanded FIXME #23616
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/loop-break-cont-1.rs b/src/test/run-pass/loop-break-cont-1.rs
index eaf69dbae00..5abac0e65a3 100644
--- a/src/test/run-pass/loop-break-cont-1.rs
+++ b/src/test/run-pass/loop-break-cont-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
   let _i = 0_usize;
diff --git a/src/test/run-pass/loop-scope.rs b/src/test/run-pass/loop-scope.rs
index 70f2830555a..0c1e7916cdb 100644
--- a/src/test/run-pass/loop-scope.rs
+++ b/src/test/run-pass/loop-scope.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = vec!(10, 20, 30);
diff --git a/src/test/run-pass/macro-block-nonterminal.rs b/src/test/run-pass/macro-block-nonterminal.rs
index 496534a5362..21b284f420f 100644
--- a/src/test/run-pass/macro-block-nonterminal.rs
+++ b/src/test/run-pass/macro-block-nonterminal.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! do_block{
     ($val:block) => {$val}
diff --git a/src/test/run-pass/macro-crate-def-only.rs b/src/test/run-pass/macro-crate-def-only.rs
index 58b09fa4921..28be058b9a3 100644
--- a/src/test/run-pass/macro-crate-def-only.rs
+++ b/src/test/run-pass/macro-crate-def-only.rs
@@ -10,7 +10,6 @@
 
 // aux-build:macro_crate_def_only.rs
 
-// pretty-expanded FIXME #23616
 
 #[macro_use] #[no_link]
 extern crate macro_crate_def_only;
diff --git a/src/test/run-pass/macro-crate-use.rs b/src/test/run-pass/macro-crate-use.rs
index 557f982713a..c7255f67fa6 100644
--- a/src/test/run-pass/macro-crate-use.rs
+++ b/src/test/run-pass/macro-crate-use.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn increment(x: usize) -> usize {
     x + 1
diff --git a/src/test/run-pass/macro-deep_expansion.rs b/src/test/run-pass/macro-deep_expansion.rs
index fd21ed0150a..3e8548ff49d 100644
--- a/src/test/run-pass/macro-deep_expansion.rs
+++ b/src/test/run-pass/macro-deep_expansion.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! foo2 {
     () => {
diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/run-pass/macro-interpolation.rs
index e6b5d50b36e..6dcd1538ebc 100644
--- a/src/test/run-pass/macro-interpolation.rs
+++ b/src/test/run-pass/macro-interpolation.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! overly_complicated {
     ($fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path) =>
diff --git a/src/test/run-pass/macro-method-issue-4621.rs b/src/test/run-pass/macro-method-issue-4621.rs
index cb154045977..64648cae5e6 100644
--- a/src/test/run-pass/macro-method-issue-4621.rs
+++ b/src/test/run-pass/macro-method-issue-4621.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct A;
 
diff --git a/src/test/run-pass/macro-of-higher-order.rs b/src/test/run-pass/macro-of-higher-order.rs
index ebd58f77228..52e19b37d79 100644
--- a/src/test/run-pass/macro-of-higher-order.rs
+++ b/src/test/run-pass/macro-of-higher-order.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! higher_order {
     (subst $lhs:tt => $rhs:tt) => ({
diff --git a/src/test/run-pass/macro-pat.rs b/src/test/run-pass/macro-pat.rs
index 659113d4e0c..48e521de57e 100644
--- a/src/test/run-pass/macro-pat.rs
+++ b/src/test/run-pass/macro-pat.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 macro_rules! mypat {
     () => (
diff --git a/src/test/run-pass/macro-path.rs b/src/test/run-pass/macro-path.rs
index 2e880622977..7aecc1dc203 100644
--- a/src/test/run-pass/macro-path.rs
+++ b/src/test/run-pass/macro-path.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod m {
     pub type t = isize;
diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/run-pass/macro-with-attrs1.rs
index 0938c16c304..99bf71b1f01 100644
--- a/src/test/run-pass/macro-with-attrs1.rs
+++ b/src/test/run-pass/macro-with-attrs1.rs
@@ -10,7 +10,6 @@
 
 // compile-flags: --cfg foo
 
-// pretty-expanded FIXME #23616
 
 #[cfg(foo)]
 macro_rules! foo { () => (1) }
diff --git a/src/test/run-pass/macro-with-attrs2.rs b/src/test/run-pass/macro-with-attrs2.rs
index cf48c325f1f..062c8d55d52 100644
--- a/src/test/run-pass/macro-with-attrs2.rs
+++ b/src/test/run-pass/macro-with-attrs2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[cfg(foo)]
 macro_rules! foo { () => (1) }
diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/run-pass/match-arm-statics.rs
index 1b4dfb869d4..43ff69fe75e 100644
--- a/src/test/run-pass/match-arm-statics.rs
+++ b/src/test/run-pass/match-arm-statics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct NewBool(bool);
 
diff --git a/src/test/run-pass/match-borrowed_str.rs b/src/test/run-pass/match-borrowed_str.rs
index 574c4b9f00e..b027e62494c 100644
--- a/src/test/run-pass/match-borrowed_str.rs
+++ b/src/test/run-pass/match-borrowed_str.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unnecessary_allocation)]
 
diff --git a/src/test/run-pass/match-bot-2.rs b/src/test/run-pass/match-bot-2.rs
index 4fa951b3479..88c514a724f 100644
--- a/src/test/run-pass/match-bot-2.rs
+++ b/src/test/run-pass/match-bot-2.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // n.b. This was only ever failing with optimization disabled.
-// pretty-expanded FIXME #23616
 
 fn a() -> isize { match return 1 { 2 => 3, _ => panic!() } }
 pub fn main() { a(); }
diff --git a/src/test/run-pass/match-enum-struct-0.rs b/src/test/run-pass/match-enum-struct-0.rs
index 06d19cec185..1754dc0c960 100644
--- a/src/test/run-pass/match-enum-struct-0.rs
+++ b/src/test/run-pass/match-enum-struct-0.rs
@@ -10,7 +10,6 @@
 
 // regression test for issue #5625
 
-// pretty-expanded FIXME #23616
 
 enum E {
     Foo{f : isize},
diff --git a/src/test/run-pass/match-enum-struct-1.rs b/src/test/run-pass/match-enum-struct-1.rs
index e4766f32a57..ebf2db36700 100644
--- a/src/test/run-pass/match-enum-struct-1.rs
+++ b/src/test/run-pass/match-enum-struct-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum E {
     Foo{f : isize},
diff --git a/src/test/run-pass/match-implicit-copy-unique.rs b/src/test/run-pass/match-implicit-copy-unique.rs
index d481c02eb41..d75bdaf4da8 100644
--- a/src/test/run-pass/match-implicit-copy-unique.rs
+++ b/src/test/run-pass/match-implicit-copy-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/match-in-macro.rs b/src/test/run-pass/match-in-macro.rs
index 27bbbc936ae..e096c97e16f 100644
--- a/src/test/run-pass/match-in-macro.rs
+++ b/src/test/run-pass/match-in-macro.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     B { b1: isize, bb1: isize},
diff --git a/src/test/run-pass/match-pattern-bindings.rs b/src/test/run-pass/match-pattern-bindings.rs
index d230f18f2bd..9f687ab99e8 100644
--- a/src/test/run-pass/match-pattern-bindings.rs
+++ b/src/test/run-pass/match-pattern-bindings.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let value = Some(1);
diff --git a/src/test/run-pass/match-pipe-binding.rs b/src/test/run-pass/match-pipe-binding.rs
index 70d3639a785..bda90d3aaec 100644
--- a/src/test/run-pass/match-pipe-binding.rs
+++ b/src/test/run-pass/match-pipe-binding.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test1() {
     // from issue 6338
diff --git a/src/test/run-pass/match-ref-binding-in-guard-3256.rs b/src/test/run-pass/match-ref-binding-in-guard-3256.rs
index 1e2ebf42a99..dc3c759078f 100644
--- a/src/test/run-pass/match-ref-binding-in-guard-3256.rs
+++ b/src/test/run-pass/match-ref-binding-in-guard-3256.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::Mutex;
 
diff --git a/src/test/run-pass/match-ref-binding-mut-option.rs b/src/test/run-pass/match-ref-binding-mut-option.rs
index 41f00e58ff7..f429e7b58e3 100644
--- a/src/test/run-pass/match-ref-binding-mut-option.rs
+++ b/src/test/run-pass/match-ref-binding-mut-option.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut v = Some(22);
diff --git a/src/test/run-pass/match-ref-binding-mut.rs b/src/test/run-pass/match-ref-binding-mut.rs
index 26c91e1703c..abc418ddd51 100644
--- a/src/test/run-pass/match-ref-binding-mut.rs
+++ b/src/test/run-pass/match-ref-binding-mut.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Rec {
     f: isize
diff --git a/src/test/run-pass/match-ref-binding.rs b/src/test/run-pass/match-ref-binding.rs
index 826edb30b36..eab7ed529b1 100644
--- a/src/test/run-pass/match-ref-binding.rs
+++ b/src/test/run-pass/match-ref-binding.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn destructure(x: Option<isize>) -> isize {
     match x {
diff --git a/src/test/run-pass/match-static-const-rename.rs b/src/test/run-pass/match-static-const-rename.rs
index 21b806f80de..08f3182900f 100644
--- a/src/test/run-pass/match-static-const-rename.rs
+++ b/src/test/run-pass/match-static-const-rename.rs
@@ -16,7 +16,6 @@
 // around this problem locally by renaming the constant in the `use`
 // form to an uppercase identifier that placates the lint.
 
-// pretty-expanded FIXME #23616
 
 #![deny(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/match-str.rs b/src/test/run-pass/match-str.rs
index 5d8958c6b9e..e6def65e53a 100644
--- a/src/test/run-pass/match-str.rs
+++ b/src/test/run-pass/match-str.rs
@@ -10,7 +10,6 @@
 
 // Issue #53
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match "test" { "not-test" => panic!(), "test" => (), _ => panic!() }
diff --git a/src/test/run-pass/match-struct-0.rs b/src/test/run-pass/match-struct-0.rs
index 450b310b8f4..e9e45df460d 100644
--- a/src/test/run-pass/match-struct-0.rs
+++ b/src/test/run-pass/match-struct-0.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo{
     f : isize,
diff --git a/src/test/run-pass/match-tag.rs b/src/test/run-pass/match-tag.rs
index 82d29f9050b..e4a0d4e95f3 100644
--- a/src/test/run-pass/match-tag.rs
+++ b/src/test/run-pass/match-tag.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 enum color {
     rgb(isize, isize, isize),
diff --git a/src/test/run-pass/match-vec-alternatives.rs b/src/test/run-pass/match-vec-alternatives.rs
index f9b49281bab..43e0b442251 100644
--- a/src/test/run-pass/match-vec-alternatives.rs
+++ b/src/test/run-pass/match-vec-alternatives.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(advanced_slice_patterns)]
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/run-pass/match-vec-rvalue.rs
index e368aeb9769..a10f9b1d7d6 100644
--- a/src/test/run-pass/match-vec-rvalue.rs
+++ b/src/test/run-pass/match-vec-rvalue.rs
@@ -11,7 +11,6 @@
 // Tests that matching rvalues with drops does not crash.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match vec!(1, 2, 3) {
diff --git a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs b/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs
index 7cc762c9348..25e0b272fd2 100644
--- a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs
+++ b/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs
@@ -12,7 +12,6 @@
 // type is `&mut [u8]`, passes in a pointer to the lvalue and not a
 // temporary. Issue #19147.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core, old_io)]
 
diff --git a/src/test/run-pass/method-projection.rs b/src/test/run-pass/method-projection.rs
index 3db72682070..41d92cc7593 100644
--- a/src/test/run-pass/method-projection.rs
+++ b/src/test/run-pass/method-projection.rs
@@ -13,7 +13,6 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-// pretty-expanded FIXME #23616
 
 trait MakeString {
     fn make_string(&self) -> String;
diff --git a/src/test/run-pass/method-self-arg-aux1.rs b/src/test/run-pass/method-self-arg-aux1.rs
index 768e7f94862..acda78af5c3 100644
--- a/src/test/run-pass/method-self-arg-aux1.rs
+++ b/src/test/run-pass/method-self-arg-aux1.rs
@@ -10,7 +10,6 @@
 
 // Test method calls with self as an argument (cross-crate)
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/method-self-arg-aux2.rs b/src/test/run-pass/method-self-arg-aux2.rs
index b40333c67c6..0aea4139b0c 100644
--- a/src/test/run-pass/method-self-arg-aux2.rs
+++ b/src/test/run-pass/method-self-arg-aux2.rs
@@ -10,7 +10,6 @@
 
 // Test method calls with self as an argument (cross-crate)
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/method-self-arg-trait.rs b/src/test/run-pass/method-self-arg-trait.rs
index f0ca0a70acc..2ba3e78ef15 100644
--- a/src/test/run-pass/method-self-arg-trait.rs
+++ b/src/test/run-pass/method-self-arg-trait.rs
@@ -10,7 +10,6 @@
 
 // Test method calls with self as an argument
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/method-self-arg.rs b/src/test/run-pass/method-self-arg.rs
index dfc12119222..543133a3268 100644
--- a/src/test/run-pass/method-self-arg.rs
+++ b/src/test/run-pass/method-self-arg.rs
@@ -10,7 +10,6 @@
 
 // Test method calls with self as an argument
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/method-two-trait-defer-resolution-1.rs b/src/test/run-pass/method-two-trait-defer-resolution-1.rs
index d0e0427f378..ff80ee19868 100644
--- a/src/test/run-pass/method-two-trait-defer-resolution-1.rs
+++ b/src/test/run-pass/method-two-trait-defer-resolution-1.rs
@@ -11,7 +11,6 @@
 // Test that we pick which version of `foo` to run based on the
 // type that is (ultimately) inferred for `x`.
 
-// pretty-expanded FIXME #23616
 
 trait foo {
     fn foo(&self) -> i32;
diff --git a/src/test/run-pass/method-two-trait-defer-resolution-2.rs b/src/test/run-pass/method-two-trait-defer-resolution-2.rs
index 2ceff22adb9..e1b64f250d8 100644
--- a/src/test/run-pass/method-two-trait-defer-resolution-2.rs
+++ b/src/test/run-pass/method-two-trait-defer-resolution-2.rs
@@ -19,7 +19,6 @@
 // translate the call as `Foo::foo(&x)` and let the specific impl get
 // chosen later.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/method-where-clause.rs b/src/test/run-pass/method-where-clause.rs
index f2ff0abfad8..078dbe0e79e 100644
--- a/src/test/run-pass/method-where-clause.rs
+++ b/src/test/run-pass/method-where-clause.rs
@@ -11,7 +11,6 @@
 // Test that we can use method notation to call methods based on a
 // where clause type, and not only type parameters.
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn foo(&self) -> i32;
diff --git a/src/test/run-pass/mod-inside-fn.rs b/src/test/run-pass/mod-inside-fn.rs
index 836f2960d71..6b922634aad 100644
--- a/src/test/run-pass/mod-inside-fn.rs
+++ b/src/test/run-pass/mod-inside-fn.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f() -> isize {
     mod m {
diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs
index 9ccb8f2e6fd..e309fa14302 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/run-pass/monad.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 trait vec_monad<A> {
     fn bind<B, F>(&self, f: F ) -> Vec<B> where F: FnMut(&A) -> Vec<B> ;
diff --git a/src/test/run-pass/move-1-unique.rs b/src/test/run-pass/move-1-unique.rs
index ab9770b13d4..34a3bdf8765 100644
--- a/src/test/run-pass/move-1-unique.rs
+++ b/src/test/run-pass/move-1-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-2-unique.rs b/src/test/run-pass/move-2-unique.rs
index c65e58a7b65..e4dc82f9801 100644
--- a/src/test/run-pass/move-2-unique.rs
+++ b/src/test/run-pass/move-2-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-2.rs b/src/test/run-pass/move-2.rs
index 054b57b2f43..0c89c89eb8a 100644
--- a/src/test/run-pass/move-2.rs
+++ b/src/test/run-pass/move-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs
index 6036fa26ccf..360593ffe48 100644
--- a/src/test/run-pass/move-3-unique.rs
+++ b/src/test/run-pass/move-3-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs
index 79a1b294da9..9f80ecf2979 100644
--- a/src/test/run-pass/move-4-unique.rs
+++ b/src/test/run-pass/move-4-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs
index 16ef9502354..1346860d51d 100644
--- a/src/test/run-pass/move-4.rs
+++ b/src/test/run-pass/move-4.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/run-pass/move-arg-2-unique.rs
index 7aec948c8d4..fa69731963a 100644
--- a/src/test/run-pass/move-arg-2-unique.rs
+++ b/src/test/run-pass/move-arg-2-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/run-pass/move-arg-2.rs
index 69b66d81e43..6e22deed269 100644
--- a/src/test/run-pass/move-arg-2.rs
+++ b/src/test/run-pass/move-arg-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/move-arg.rs b/src/test/run-pass/move-arg.rs
index 3d9eba8c09f..0ff9a35874b 100644
--- a/src/test/run-pass/move-arg.rs
+++ b/src/test/run-pass/move-arg.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test(foo: isize) { assert!((foo == 10)); }
 
diff --git a/src/test/run-pass/move-out-of-field.rs b/src/test/run-pass/move-out-of-field.rs
index a0eba4685b8..262add090bd 100644
--- a/src/test/run-pass/move-out-of-field.rs
+++ b/src/test/run-pass/move-out-of-field.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::string::String;
 
diff --git a/src/test/run-pass/move-scalar.rs b/src/test/run-pass/move-scalar.rs
index a5b0a8b9bf4..798424d107e 100644
--- a/src/test/run-pass/move-scalar.rs
+++ b/src/test/run-pass/move-scalar.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
 
diff --git a/src/test/run-pass/multi-let.rs b/src/test/run-pass/multi-let.rs
index 658b34e13f9..1079857c1b3 100644
--- a/src/test/run-pass/multi-let.rs
+++ b/src/test/run-pass/multi-let.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let x = 10;
diff --git a/src/test/run-pass/multidispatch1.rs b/src/test/run-pass/multidispatch1.rs
index fdf9f95b274..7137a4109b1 100644
--- a/src/test/run-pass/multidispatch1.rs
+++ b/src/test/run-pass/multidispatch1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::fmt::Debug;
 
diff --git a/src/test/run-pass/multidispatch2.rs b/src/test/run-pass/multidispatch2.rs
index 75c6c5ac7d1..1573c0234a6 100644
--- a/src/test/run-pass/multidispatch2.rs
+++ b/src/test/run-pass/multidispatch2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::fmt::Debug;
 use std::default::Default;
diff --git a/src/test/run-pass/mut-function-arguments.rs b/src/test/run-pass/mut-function-arguments.rs
index 644e4557552..f415a7f2d66 100644
--- a/src/test/run-pass/mut-function-arguments.rs
+++ b/src/test/run-pass/mut-function-arguments.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/mut-in-ident-patterns.rs b/src/test/run-pass/mut-in-ident-patterns.rs
index 2a8f6f1fc31..32ff7efffa0 100644
--- a/src/test/run-pass/mut-in-ident-patterns.rs
+++ b/src/test/run-pass/mut-in-ident-patterns.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn foo(&self, mut x: isize) -> isize {
diff --git a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs
index bed3b87def5..1766e65b9c7 100644
--- a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs
+++ b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn test1() {
     let mut ints = [0; 32];
diff --git a/src/test/run-pass/negative.rs b/src/test/run-pass/negative.rs
index c5b6a6a035b..df074ddc06a 100644
--- a/src/test/run-pass/negative.rs
+++ b/src/test/run-pass/negative.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match -5 {
diff --git a/src/test/run-pass/nested-class.rs b/src/test/run-pass/nested-class.rs
index 86197d44a68..1ad68cb9de0 100644
--- a/src/test/run-pass/nested-class.rs
+++ b/src/test/run-pass/nested-class.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     struct b {
diff --git a/src/test/run-pass/nested-function-names-issue-8587.rs b/src/test/run-pass/nested-function-names-issue-8587.rs
index 28f3438f986..24b1f5ac75e 100644
--- a/src/test/run-pass/nested-function-names-issue-8587.rs
+++ b/src/test/run-pass/nested-function-names-issue-8587.rs
@@ -13,7 +13,6 @@
 //
 // Issue #8587
 
-// pretty-expanded FIXME #23616
 
 pub struct X;
 
diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/run-pass/nested_item_main.rs
index f7adfe36695..b24d517f737 100644
--- a/src/test/run-pass/nested_item_main.rs
+++ b/src/test/run-pass/nested_item_main.rs
@@ -10,7 +10,6 @@
 
 // aux-build:nested_item.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate nested_item;
 
diff --git a/src/test/run-pass/new-unicode-escapes.rs b/src/test/run-pass/new-unicode-escapes.rs
index 8c2d5e09adb..bfad79e92d2 100644
--- a/src/test/run-pass/new-unicode-escapes.rs
+++ b/src/test/run-pass/new-unicode-escapes.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/newlambdas.rs b/src/test/run-pass/newlambdas.rs
index c6fa7cc35fd..a6f39958632 100644
--- a/src/test/run-pass/newlambdas.rs
+++ b/src/test/run-pass/newlambdas.rs
@@ -10,7 +10,6 @@
 
 // Tests for the new |args| expr lambda syntax
 
-// pretty-expanded FIXME #23616
 
 fn f<F>(i: isize, f: F) -> isize where F: FnOnce(isize) -> isize { f(i) }
 
diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs
index 424d518895c..91599608cee 100644
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/run-pass/newtype-polymorphic.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #[derive(Clone)]
 struct myvec<X>(Vec<X> );
diff --git a/src/test/run-pass/newtype-struct-drop-run.rs b/src/test/run-pass/newtype-struct-drop-run.rs
index 2d162ba7e33..4407002aca8 100644
--- a/src/test/run-pass/newtype-struct-drop-run.rs
+++ b/src/test/run-pass/newtype-struct-drop-run.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/no-landing-pads.rs b/src/test/run-pass/no-landing-pads.rs
index da57c81a669..d90e7ef5e47 100644
--- a/src/test/run-pass/no-landing-pads.rs
+++ b/src/test/run-pass/no-landing-pads.rs
@@ -10,7 +10,6 @@
 
 // compile-flags: -Z no-landing-pads
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/non-legacy-modes.rs b/src/test/run-pass/non-legacy-modes.rs
index 5f1c69bb4b6..58534ed96da 100644
--- a/src/test/run-pass/non-legacy-modes.rs
+++ b/src/test/run-pass/non-legacy-modes.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct X {
     repr: isize
diff --git a/src/test/run-pass/nul-characters.rs b/src/test/run-pass/nul-characters.rs
index 25c111daad5..cbea5e71f25 100644
--- a/src/test/run-pass/nul-characters.rs
+++ b/src/test/run-pass/nul-characters.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main()
 {
diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/run-pass/nullable-pointer-ffi-compat.rs
index 22aa09c718a..224111900d6 100644
--- a/src/test/run-pass/nullable-pointer-ffi-compat.rs
+++ b/src/test/run-pass/nullable-pointer-ffi-compat.rs
@@ -20,7 +20,6 @@
 // then we simply express the enum as just a pointer and not wrap it
 // in a struct.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs
index ad2716e00de..ced2b24f36c 100644
--- a/src/test/run-pass/nullable-pointer-iotareduction.rs
+++ b/src/test/run-pass/nullable-pointer-iotareduction.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs
index 6e3f438575e..b097d350c8d 100644
--- a/src/test/run-pass/nullable-pointer-size.rs
+++ b/src/test/run-pass/nullable-pointer-size.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/nullary-or-pattern.rs b/src/test/run-pass/nullary-or-pattern.rs
index f4cfc808274..feb8726c0e4 100644
--- a/src/test/run-pass/nullary-or-pattern.rs
+++ b/src/test/run-pass/nullary-or-pattern.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum blah { a, b, }
 
diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/run-pass/numeric-method-autoexport.rs
index cb41949a722..d5f64c1c7b1 100644
--- a/src/test/run-pass/numeric-method-autoexport.rs
+++ b/src/test/run-pass/numeric-method-autoexport.rs
@@ -15,7 +15,6 @@
 // necessary. Testing the methods of the impls is done within the source
 // file for each numeric type.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/object-method-numbering.rs b/src/test/run-pass/object-method-numbering.rs
index 8b8c56aee83..82d34fa9ae4 100644
--- a/src/test/run-pass/object-method-numbering.rs
+++ b/src/test/run-pass/object-method-numbering.rs
@@ -11,7 +11,6 @@
 // Test for using an object with an associated type binding as the
 // instantiation for a generic type with a bound.
 
-// pretty-expanded FIXME #23616
 
 trait SomeTrait {
     type SomeType;
diff --git a/src/test/run-pass/object-safety-sized-self-by-value-self.rs b/src/test/run-pass/object-safety-sized-self-by-value-self.rs
index b735743927c..81acd94ebe5 100644
--- a/src/test/run-pass/object-safety-sized-self-by-value-self.rs
+++ b/src/test/run-pass/object-safety-sized-self-by-value-self.rs
@@ -11,7 +11,6 @@
 // Check that a trait is still object-safe (and usable) if it has
 // methods with by-value self so long as they require `Self : Sized`.
 
-// pretty-expanded FIXME #23616
 
 trait Counter {
     fn tick(&mut self) -> u32;
diff --git a/src/test/run-pass/object-safety-sized-self-generic-method.rs b/src/test/run-pass/object-safety-sized-self-generic-method.rs
index 696c5a09709..2e84117566e 100644
--- a/src/test/run-pass/object-safety-sized-self-generic-method.rs
+++ b/src/test/run-pass/object-safety-sized-self-generic-method.rs
@@ -11,7 +11,6 @@
 // Check that a trait is still object-safe (and usable) if it has
 // generic methods so long as they require `Self : Sized`.
 
-// pretty-expanded FIXME #23616
 
 trait Counter {
     fn tick(&mut self) -> u32;
diff --git a/src/test/run-pass/object-safety-sized-self-return-Self.rs b/src/test/run-pass/object-safety-sized-self-return-Self.rs
index 17c41f2194b..eda541262bd 100644
--- a/src/test/run-pass/object-safety-sized-self-return-Self.rs
+++ b/src/test/run-pass/object-safety-sized-self-return-Self.rs
@@ -11,7 +11,6 @@
 // Check that a trait is still object-safe (and usable) if it has
 // methods that return `Self` so long as they require `Self : Sized`.
 
-// pretty-expanded FIXME #23616
 
 trait Counter {
     fn new() -> Self where Self : Sized;
diff --git a/src/test/run-pass/objects-coerce-freeze-borrored.rs b/src/test/run-pass/objects-coerce-freeze-borrored.rs
index 686924a3140..f907b5723f4 100644
--- a/src/test/run-pass/objects-coerce-freeze-borrored.rs
+++ b/src/test/run-pass/objects-coerce-freeze-borrored.rs
@@ -10,7 +10,6 @@
 
 // Test that we can coerce an `@Object` to an `&Object`
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn foo(&self) -> usize;
diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
index 9a1cdd2922f..176f67fd3a1 100644
--- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
+++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
@@ -12,7 +12,6 @@
 // closed over do not contain managed values, and thus the boxes do
 // not have headers.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/objects-owned-object-owned-method.rs b/src/test/run-pass/objects-owned-object-owned-method.rs
index 4357adbf65b..71ed995e76c 100644
--- a/src/test/run-pass/objects-owned-object-owned-method.rs
+++ b/src/test/run-pass/objects-owned-object-owned-method.rs
@@ -12,7 +12,6 @@
 // closed over contain managed values. This implies that the boxes
 // will have headers that must be skipped over.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/run-pass/once-move-out-on-heap.rs
index 7bf8b693d9b..6dd4c0ddce3 100644
--- a/src/test/run-pass/once-move-out-on-heap.rs
+++ b/src/test/run-pass/once-move-out-on-heap.rs
@@ -11,7 +11,6 @@
 // Testing guarantees provided by once functions.
 
 
-// pretty-expanded FIXME #23616
 
 use std::sync::Arc;
 
diff --git a/src/test/run-pass/one-tuple.rs b/src/test/run-pass/one-tuple.rs
index 6520e42dbe3..68974b47d06 100644
--- a/src/test/run-pass/one-tuple.rs
+++ b/src/test/run-pass/one-tuple.rs
@@ -10,7 +10,6 @@
 
 // Why one-tuples? Because macros.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     match ('c',) {
diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/run-pass/operator-associativity.rs
index ccfdb83ab8a..78834ef914d 100644
--- a/src/test/run-pass/operator-associativity.rs
+++ b/src/test/run-pass/operator-associativity.rs
@@ -12,6 +12,5 @@
 
 
 // Testcase for issue #130, operator associativity.
-// pretty-expanded FIXME #23616
 
 pub fn main() { assert!((3 * 5 / 2 == 7)); }
diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/run-pass/option-unwrap.rs
index 4902038667c..44f13a3eb1a 100644
--- a/src/test/run-pass/option-unwrap.rs
+++ b/src/test/run-pass/option-unwrap.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/or-pattern.rs b/src/test/run-pass/or-pattern.rs
index 3ab78e8d053..3bb0c71c581 100644
--- a/src/test/run-pass/or-pattern.rs
+++ b/src/test/run-pass/or-pattern.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum blah { a(isize, isize, usize), b(isize, isize), c, }
 
diff --git a/src/test/run-pass/order-drop-with-match.rs b/src/test/run-pass/order-drop-with-match.rs
index c8a2ba0af47..8f82e3aaba1 100644
--- a/src/test/run-pass/order-drop-with-match.rs
+++ b/src/test/run-pass/order-drop-with-match.rs
@@ -14,7 +14,6 @@
 // in ORDER matching up to when it ran.
 // Correct order is: matched, inner, outer
 
-// pretty-expanded FIXME #23616
 
 static mut ORDER: [usize; 3] = [0, 0, 0];
 static mut INDEX: usize = 0;
diff --git a/src/test/run-pass/out-pointer-aliasing.rs b/src/test/run-pass/out-pointer-aliasing.rs
index 0a58411041e..790affd939f 100644
--- a/src/test/run-pass/out-pointer-aliasing.rs
+++ b/src/test/run-pass/out-pointer-aliasing.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 pub struct Foo {
diff --git a/src/test/run-pass/overloaded-autoderef-indexing.rs b/src/test/run-pass/overloaded-autoderef-indexing.rs
index fdf42423b66..67b8bc1d157 100644
--- a/src/test/run-pass/overloaded-autoderef-indexing.rs
+++ b/src/test/run-pass/overloaded-autoderef-indexing.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Deref;
 
diff --git a/src/test/run-pass/overloaded-autoderef-order.rs b/src/test/run-pass/overloaded-autoderef-order.rs
index 6880032e69f..7433494dec6 100644
--- a/src/test/run-pass/overloaded-autoderef-order.rs
+++ b/src/test/run-pass/overloaded-autoderef-order.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::rc::Rc;
 use std::ops::Deref;
diff --git a/src/test/run-pass/overloaded-autoderef-vtable.rs b/src/test/run-pass/overloaded-autoderef-vtable.rs
index 38bf68b7469..ed11c8c0bae 100644
--- a/src/test/run-pass/overloaded-autoderef-vtable.rs
+++ b/src/test/run-pass/overloaded-autoderef-vtable.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Deref;
 
diff --git a/src/test/run-pass/overloaded-autoderef-xcrate.rs b/src/test/run-pass/overloaded-autoderef-xcrate.rs
index b97fb491124..174e09cb14c 100644
--- a/src/test/run-pass/overloaded-autoderef-xcrate.rs
+++ b/src/test/run-pass/overloaded-autoderef-xcrate.rs
@@ -10,7 +10,6 @@
 
 // aux-build:overloaded_autoderef_xc.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate overloaded_autoderef_xc;
 
diff --git a/src/test/run-pass/overloaded-calls-object-one-arg.rs b/src/test/run-pass/overloaded-calls-object-one-arg.rs
index 291d2c6498f..ec64f627c94 100644
--- a/src/test/run-pass/overloaded-calls-object-one-arg.rs
+++ b/src/test/run-pass/overloaded-calls-object-one-arg.rs
@@ -11,7 +11,6 @@
 // Tests calls to closure arguments where the closure takes 1 argument.
 // This is a bit tricky due to rust-call ABI.
 
-// pretty-expanded FIXME #23616
 
 fn foo(f: &mut FnMut(isize) -> isize) -> isize {
     f(22)
diff --git a/src/test/run-pass/overloaded-calls-object-two-args.rs b/src/test/run-pass/overloaded-calls-object-two-args.rs
index 42c71572a3a..c38a62147a0 100644
--- a/src/test/run-pass/overloaded-calls-object-two-args.rs
+++ b/src/test/run-pass/overloaded-calls-object-two-args.rs
@@ -11,7 +11,6 @@
 // Tests calls to closure arguments where the closure takes 2 arguments.
 // This is a bit tricky due to rust-call ABI.
 
-// pretty-expanded FIXME #23616
 
 fn foo(f: &mut FnMut(isize, isize) -> isize) -> isize {
     f(1, 2)
diff --git a/src/test/run-pass/overloaded-calls-object-zero-args.rs b/src/test/run-pass/overloaded-calls-object-zero-args.rs
index 9bc6c9f0428..08ab465ebb0 100644
--- a/src/test/run-pass/overloaded-calls-object-zero-args.rs
+++ b/src/test/run-pass/overloaded-calls-object-zero-args.rs
@@ -11,7 +11,6 @@
 // Tests calls to closure arguments where the closure takes 0 arguments.
 // This is a bit tricky due to rust-call ABI.
 
-// pretty-expanded FIXME #23616
 
 fn foo(f: &mut FnMut() -> isize) -> isize {
     f()
diff --git a/src/test/run-pass/overloaded-calls-simple.rs b/src/test/run-pass/overloaded-calls-simple.rs
index eeb705a2e3c..6566f6c1260 100644
--- a/src/test/run-pass/overloaded-calls-simple.rs
+++ b/src/test/run-pass/overloaded-calls-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(lang_items, unboxed_closures, core)]
 
diff --git a/src/test/run-pass/overloaded-calls-zero-args.rs b/src/test/run-pass/overloaded-calls-zero-args.rs
index 8df4adf6713..621b2f94209 100644
--- a/src/test/run-pass/overloaded-calls-zero-args.rs
+++ b/src/test/run-pass/overloaded-calls-zero-args.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/overloaded-deref-count.rs b/src/test/run-pass/overloaded-deref-count.rs
index 5f6eb87ae1b..a8a3b3014e0 100644
--- a/src/test/run-pass/overloaded-deref-count.rs
+++ b/src/test/run-pass/overloaded-deref-count.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::cell::Cell;
 use std::ops::{Deref, DerefMut};
diff --git a/src/test/run-pass/overloaded-index-assoc-list.rs b/src/test/run-pass/overloaded-index-assoc-list.rs
index d98b1d9deae..455099f1eba 100644
--- a/src/test/run-pass/overloaded-index-assoc-list.rs
+++ b/src/test/run-pass/overloaded-index-assoc-list.rs
@@ -11,7 +11,6 @@
 // Test overloading of the `[]` operator.  In particular test that it
 // takes its argument *by reference*.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/overloaded-index-autoderef.rs b/src/test/run-pass/overloaded-index-autoderef.rs
index 56d71edd56c..efa00514934 100644
--- a/src/test/run-pass/overloaded-index-autoderef.rs
+++ b/src/test/run-pass/overloaded-index-autoderef.rs
@@ -10,7 +10,6 @@
 
 // Test overloaded indexing combined with autoderef.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax, core)]
diff --git a/src/test/run-pass/overloaded-index-in-field.rs b/src/test/run-pass/overloaded-index-in-field.rs
index bc53836aca3..ff867e76810 100644
--- a/src/test/run-pass/overloaded-index-in-field.rs
+++ b/src/test/run-pass/overloaded-index-in-field.rs
@@ -11,7 +11,6 @@
 // Test using overloaded indexing when the "map" is stored in a
 // field. This caused problems at some point.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/overloaded-index.rs b/src/test/run-pass/overloaded-index.rs
index 4f8cf0e9e38..fa3c107697e 100644
--- a/src/test/run-pass/overloaded-index.rs
+++ b/src/test/run-pass/overloaded-index.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/packed-struct-borrow-element.rs b/src/test/run-pass/packed-struct-borrow-element.rs
index 8819b201361..48868740621 100644
--- a/src/test/run-pass/packed-struct-borrow-element.rs
+++ b/src/test/run-pass/packed-struct-borrow-element.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[repr(packed)]
 struct Foo {
diff --git a/src/test/run-pass/packed-struct-generic-layout.rs b/src/test/run-pass/packed-struct-generic-layout.rs
index 5d518749d9a..e03772ddf9f 100644
--- a/src/test/run-pass/packed-struct-generic-layout.rs
+++ b/src/test/run-pass/packed-struct-generic-layout.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/run-pass/packed-struct-generic-size.rs
index 6c24b71971e..4e1f62b28ab 100644
--- a/src/test/run-pass/packed-struct-generic-size.rs
+++ b/src/test/run-pass/packed-struct-generic-size.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/packed-struct-layout.rs b/src/test/run-pass/packed-struct-layout.rs
index 5d2454be2fb..2ac07a5d7ea 100644
--- a/src/test/run-pass/packed-struct-layout.rs
+++ b/src/test/run-pass/packed-struct-layout.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/packed-struct-match.rs b/src/test/run-pass/packed-struct-match.rs
index 3c3d632222e..3cd254014c1 100644
--- a/src/test/run-pass/packed-struct-match.rs
+++ b/src/test/run-pass/packed-struct-match.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[repr(packed)]
 struct Foo {
diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/run-pass/packed-struct-size-xc.rs
index b7ea720caf7..372693433db 100644
--- a/src/test/run-pass/packed-struct-size-xc.rs
+++ b/src/test/run-pass/packed-struct-size-xc.rs
@@ -10,7 +10,6 @@
 
 // aux-build:packed.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate packed;
 
diff --git a/src/test/run-pass/packed-struct-size.rs b/src/test/run-pass/packed-struct-size.rs
index 3d748c40422..754a3573339 100644
--- a/src/test/run-pass/packed-struct-size.rs
+++ b/src/test/run-pass/packed-struct-size.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/packed-tuple-struct-layout.rs b/src/test/run-pass/packed-tuple-struct-layout.rs
index 9d96adc29dd..376aadc735b 100644
--- a/src/test/run-pass/packed-tuple-struct-layout.rs
+++ b/src/test/run-pass/packed-tuple-struct-layout.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/packed-tuple-struct-size.rs b/src/test/run-pass/packed-tuple-struct-size.rs
index 7b7cd592988..b0c8684cfe3 100644
--- a/src/test/run-pass/packed-tuple-struct-size.rs
+++ b/src/test/run-pass/packed-tuple-struct-size.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/panic-in-dtor-drops-fields.rs b/src/test/run-pass/panic-in-dtor-drops-fields.rs
index 4226fba9d3e..f84a823d3db 100644
--- a/src/test/run-pass/panic-in-dtor-drops-fields.rs
+++ b/src/test/run-pass/panic-in-dtor-drops-fields.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/pattern-bound-var-in-for-each.rs b/src/test/run-pass/pattern-bound-var-in-for-each.rs
index 1ab578b9332..59ead3e3e98 100644
--- a/src/test/run-pass/pattern-bound-var-in-for-each.rs
+++ b/src/test/run-pass/pattern-bound-var-in-for-each.rs
@@ -12,7 +12,6 @@
 // pattern-bound var is an upvar (when translating
 // the for-each body)
 
-// pretty-expanded FIXME #23616
 
 fn foo(src: usize) {
 
diff --git a/src/test/run-pass/private-class-field.rs b/src/test/run-pass/private-class-field.rs
index d32ac4b9082..8c92a05ba2a 100644
--- a/src/test/run-pass/private-class-field.rs
+++ b/src/test/run-pass/private-class-field.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct cat {
     meows : usize,
diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/run-pass/process-remove-from-env.rs
index 6429352f449..c6adda60679 100644
--- a/src/test/run-pass/process-remove-from-env.rs
+++ b/src/test/run-pass/process-remove-from-env.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(old_io)]
 
diff --git a/src/test/run-pass/range-type-infer.rs b/src/test/run-pass/range-type-infer.rs
index 2d664c00ed5..b6d4d09d697 100644
--- a/src/test/run-pass/range-type-infer.rs
+++ b/src/test/run-pass/range-type-infer.rs
@@ -12,7 +12,6 @@
 // good as the old one. Check out issue #21672, #21595 and #21649 for
 // more details.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let xs = (0..8).map(|i| i == 1u64).collect::<Vec<_>>();
diff --git a/src/test/run-pass/range.rs b/src/test/run-pass/range.rs
index 4633f73b9a0..03a8af319e8 100644
--- a/src/test/run-pass/range.rs
+++ b/src/test/run-pass/range.rs
@@ -10,7 +10,6 @@
 
 // Test range syntax.
 
-// pretty-expanded FIXME #23616
 
 fn foo() -> isize { 42 }
 
diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/run-pass/ranges-precedence.rs
index 870d7a0bc08..807e23c81cf 100644
--- a/src/test/run-pass/ranges-precedence.rs
+++ b/src/test/run-pass/ranges-precedence.rs
@@ -11,7 +11,6 @@
 // Test that the precedence of ranges is correct
 
 
-// pretty-expanded FIXME #23616
 
 struct Foo {
     foo: usize,
diff --git a/src/test/run-pass/readalias.rs b/src/test/run-pass/readalias.rs
index d3b9e56f7d0..29e45ce8a9a 100644
--- a/src/test/run-pass/readalias.rs
+++ b/src/test/run-pass/readalias.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 struct Point {x: isize, y: isize, z: isize}
 
diff --git a/src/test/run-pass/rec-extend.rs b/src/test/run-pass/rec-extend.rs
index 1071df84cd2..ffef77a4b8d 100644
--- a/src/test/run-pass/rec-extend.rs
+++ b/src/test/run-pass/rec-extend.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 struct Point {x: isize, y: isize}
 
diff --git a/src/test/run-pass/rec-tup.rs b/src/test/run-pass/rec-tup.rs
index 1644a169426..810888b0d8e 100644
--- a/src/test/run-pass/rec-tup.rs
+++ b/src/test/run-pass/rec-tup.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 struct Point {x: isize, y: isize}
diff --git a/src/test/run-pass/rec.rs b/src/test/run-pass/rec.rs
index a422aaba84b..b47bda0931f 100644
--- a/src/test/run-pass/rec.rs
+++ b/src/test/run-pass/rec.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 struct Rect {x: isize, y: isize, w: isize, h: isize}
diff --git a/src/test/run-pass/record-pat.rs b/src/test/run-pass/record-pat.rs
index 6b39cc196f1..99bec7ab7d1 100644
--- a/src/test/run-pass/record-pat.rs
+++ b/src/test/run-pass/record-pat.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum t1 { a(isize), b(usize), }
 struct T2 {x: t1, y: isize}
diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/run-pass/reexported-static-methods-cross-crate.rs
index 3efd913cf54..4d105038384 100644
--- a/src/test/run-pass/reexported-static-methods-cross-crate.rs
+++ b/src/test/run-pass/reexported-static-methods-cross-crate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:reexported_static_methods.rs
-// pretty-expanded FIXME #23616
 
 extern crate reexported_static_methods;
 
diff --git a/src/test/run-pass/regions-borrow-evec-fixed.rs b/src/test/run-pass/regions-borrow-evec-fixed.rs
index 7f3db867830..6d1f2930abf 100644
--- a/src/test/run-pass/regions-borrow-evec-fixed.rs
+++ b/src/test/run-pass/regions-borrow-evec-fixed.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn foo(x: &[isize]) -> isize {
     x[0]
diff --git a/src/test/run-pass/regions-borrow-evec-uniq.rs b/src/test/run-pass/regions-borrow-evec-uniq.rs
index adf88037d28..ec1f4eda28c 100644
--- a/src/test/run-pass/regions-borrow-evec-uniq.rs
+++ b/src/test/run-pass/regions-borrow-evec-uniq.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn foo(x: &[isize]) -> isize {
     x[0]
diff --git a/src/test/run-pass/regions-borrow-uniq.rs b/src/test/run-pass/regions-borrow-uniq.rs
index 01a4e9c20ca..2a08940dab6 100644
--- a/src/test/run-pass/regions-borrow-uniq.rs
+++ b/src/test/run-pass/regions-borrow-uniq.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-bot.rs b/src/test/run-pass/regions-bot.rs
index 269e30741f4..4347cbe2dc9 100644
--- a/src/test/run-pass/regions-bot.rs
+++ b/src/test/run-pass/regions-bot.rs
@@ -10,7 +10,6 @@
 
 // A very limited test of the "bottom" region
 
-// pretty-expanded FIXME #23616
 
 fn produce_static<T>() -> &'static T { panic!(); }
 
diff --git a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs b/src/test/run-pass/regions-close-over-type-parameter-successfully.rs
index cc417219ee3..d048633519a 100644
--- a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs
+++ b/src/test/run-pass/regions-close-over-type-parameter-successfully.rs
@@ -11,7 +11,6 @@
 // A test where we (successfully) close over a reference into
 // an object.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-copy-closure.rs b/src/test/run-pass/regions-copy-closure.rs
index 9e3fe79197d..3c01a7f8923 100644
--- a/src/test/run-pass/regions-copy-closure.rs
+++ b/src/test/run-pass/regions-copy-closure.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(unboxed_closures, core)]
diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/run-pass/regions-dependent-addr-of.rs
index 123806a4d9d..a6a179c432c 100644
--- a/src/test/run-pass/regions-dependent-addr-of.rs
+++ b/src/test/run-pass/regions-dependent-addr-of.rs
@@ -11,7 +11,6 @@
 // Test lifetimes are linked properly when we create dependent region pointers.
 // Issue #3148.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/regions-early-bound-trait-param.rs b/src/test/run-pass/regions-early-bound-trait-param.rs
index 738f5dbb7b9..33889b27a87 100644
--- a/src/test/run-pass/regions-early-bound-trait-param.rs
+++ b/src/test/run-pass/regions-early-bound-trait-param.rs
@@ -11,7 +11,6 @@
 // Tests that you can use an early-bound lifetime parameter as
 // on of the generic parameters in a trait.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs b/src/test/run-pass/regions-early-bound-used-in-bound-method.rs
index 6ad89951238..c7bc8dc0a51 100644
--- a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs
+++ b/src/test/run-pass/regions-early-bound-used-in-bound-method.rs
@@ -11,7 +11,6 @@
 // Tests that you can use a fn lifetime parameter as part of
 // the value for a type parameter in a bound.
 
-// pretty-expanded FIXME #23616
 
 trait GetRef<'a> {
     fn get(&self) -> &'a isize;
diff --git a/src/test/run-pass/regions-early-bound-used-in-bound.rs b/src/test/run-pass/regions-early-bound-used-in-bound.rs
index 6ab95d6e497..3c8c78aa116 100644
--- a/src/test/run-pass/regions-early-bound-used-in-bound.rs
+++ b/src/test/run-pass/regions-early-bound-used-in-bound.rs
@@ -11,7 +11,6 @@
 // Tests that you can use a fn lifetime parameter as part of
 // the value for a type parameter in a bound.
 
-// pretty-expanded FIXME #23616
 
 trait GetRef<'a, T> {
     fn get(&self) -> &'a T;
diff --git a/src/test/run-pass/regions-early-bound-used-in-type-param.rs b/src/test/run-pass/regions-early-bound-used-in-type-param.rs
index dc991e9493f..8d145fad004 100644
--- a/src/test/run-pass/regions-early-bound-used-in-type-param.rs
+++ b/src/test/run-pass/regions-early-bound-used-in-type-param.rs
@@ -11,7 +11,6 @@
 // Tests that you can use a fn lifetime parameter as part of
 // the value for a type parameter in a bound.
 
-// pretty-expanded FIXME #23616
 
 trait Get<T> {
     fn get(&self) -> T;
diff --git a/src/test/run-pass/regions-escape-into-other-fn.rs b/src/test/run-pass/regions-escape-into-other-fn.rs
index 3e2fec717f9..597333482fd 100644
--- a/src/test/run-pass/regions-escape-into-other-fn.rs
+++ b/src/test/run-pass/regions-escape-into-other-fn.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
index 5d171811732..5c80863ce85 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
+++ b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::swap;
 
diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/run-pass/regions-infer-borrow-scope-view.rs
index 9c200a370ad..f9ba8e82ef7 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-view.rs
+++ b/src/test/run-pass/regions-infer-borrow-scope-view.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn view<T>(x: &[T]) -> &[T] {x}
 
diff --git a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs b/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs
index 59221afceff..a89f6f4a7b5 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs
+++ b/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-infer-borrow-scope.rs b/src/test/run-pass/regions-infer-borrow-scope.rs
index 3289da3cfd8..01f41637311 100644
--- a/src/test/run-pass/regions-infer-borrow-scope.rs
+++ b/src/test/run-pass/regions-infer-borrow-scope.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-infer-call-2.rs b/src/test/run-pass/regions-infer-call-2.rs
index 7e6767b0de4..b994bc7b855 100644
--- a/src/test/run-pass/regions-infer-call-2.rs
+++ b/src/test/run-pass/regions-infer-call-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn takes_two(x: &isize, y: &isize) -> isize { *x + *y }
 
diff --git a/src/test/run-pass/regions-infer-call.rs b/src/test/run-pass/regions-infer-call.rs
index bc752a1d504..76b93f2356b 100644
--- a/src/test/run-pass/regions-infer-call.rs
+++ b/src/test/run-pass/regions-infer-call.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn takes_two(x: &isize, y: &isize) -> isize { *x + *y }
 
diff --git a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs b/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs
index 73cfbcddd9a..3c6bc133999 100644
--- a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs
+++ b/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct boxed_int<'a> {
     f: &'a isize,
diff --git a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs
index 451c745358a..d1c1ec43b40 100644
--- a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs
+++ b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs
@@ -11,7 +11,6 @@
 // This test verifies that temporary lifetime is correctly computed
 // for static objects in enclosing scopes.
 
-// pretty-expanded FIXME #23616
 
 use std::cmp::PartialEq;
 
diff --git a/src/test/run-pass/regions-no-variance-from-fn-generics.rs b/src/test/run-pass/regions-no-variance-from-fn-generics.rs
index 89bdbfaed9e..d385804da57 100644
--- a/src/test/run-pass/regions-no-variance-from-fn-generics.rs
+++ b/src/test/run-pass/regions-no-variance-from-fn-generics.rs
@@ -12,7 +12,6 @@
 // should not upset the variance inference for actual occurrences of
 // that lifetime in type expressions.
 
-// pretty-expanded FIXME #23616
 
 pub trait HasLife<'a> {
     fn dummy(&'a self) { } // just to induce a variance on 'a
diff --git a/src/test/run-pass/regions-params.rs b/src/test/run-pass/regions-params.rs
index 5002fcce96b..dbd52bd6b60 100644
--- a/src/test/run-pass/regions-params.rs
+++ b/src/test/run-pass/regions-params.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn region_identity(x: &usize) -> &usize { x }
 
diff --git a/src/test/run-pass/regions-refcell.rs b/src/test/run-pass/regions-refcell.rs
index 63525b36206..ca6a62c10c2 100644
--- a/src/test/run-pass/regions-refcell.rs
+++ b/src/test/run-pass/regions-refcell.rs
@@ -12,7 +12,6 @@
 // attempting to bootstrap librustc with new destructor lifetime
 // semantics.
 
-// pretty-expanded FIXME #23616
 
 use std::collections::HashMap;
 use std::cell::RefCell;
diff --git a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs
index a36c1b30ead..465f43e36b9 100644
--- a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs
+++ b/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs
@@ -17,7 +17,6 @@
 // changes were caught. However, those uses in the compiler could
 // easily get changed or refactored away in the future.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/regions-return-interior-of-option.rs b/src/test/run-pass/regions-return-interior-of-option.rs
index e6ab4a81426..fe1c68ff428 100644
--- a/src/test/run-pass/regions-return-interior-of-option.rs
+++ b/src/test/run-pass/regions-return-interior-of-option.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn get<T>(opt: &Option<T>) -> &T {
     match *opt {
diff --git a/src/test/run-pass/regions-trait-object-1.rs b/src/test/run-pass/regions-trait-object-1.rs
index d2352988579..542dc76061f 100644
--- a/src/test/run-pass/regions-trait-object-1.rs
+++ b/src/test/run-pass/regions-trait-object-1.rs
@@ -12,7 +12,6 @@
 // attempting to bootstrap libsyntax; it is adapted from
 // `syntax::ext::tt::generic_extension`.
 
-// pretty-expanded FIXME #23616
 
 pub struct E<'a> {
     pub f: &'a u8,
diff --git a/src/test/run-pass/repeat-expr-in-static.rs b/src/test/run-pass/repeat-expr-in-static.rs
index 5a4475ae947..a040d680f9d 100644
--- a/src/test/run-pass/repeat-expr-in-static.rs
+++ b/src/test/run-pass/repeat-expr-in-static.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 static FOO: [isize; 4] = [32; 4];
 static BAR: [isize; 4] = [32, 32, 32, 32];
diff --git a/src/test/run-pass/resolve-issue-2428.rs b/src/test/run-pass/resolve-issue-2428.rs
index bad5b83b548..d3bdd546242 100644
--- a/src/test/run-pass/resolve-issue-2428.rs
+++ b/src/test/run-pass/resolve-issue-2428.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 const foo: isize = 4 >> 1;
 enum bs { thing = foo }
diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/run-pass/resource-in-struct.rs
index a8426f90cc4..c1e1ff0658b 100644
--- a/src/test/run-pass/resource-in-struct.rs
+++ b/src/test/run-pass/resource-in-struct.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/return-from-closure.rs b/src/test/run-pass/return-from-closure.rs
index 4395f6fcb4b..76eddd05382 100644
--- a/src/test/run-pass/return-from-closure.rs
+++ b/src/test/run-pass/return-from-closure.rs
@@ -10,7 +10,6 @@
 
 // just to make sure that `return` is only returning from the closure,
 // not the surrounding function.
-// pretty-expanded FIXME #23616
 
 static mut calls: usize = 0;
 
diff --git a/src/test/run-pass/segfault-no-out-of-stack.rs b/src/test/run-pass/segfault-no-out-of-stack.rs
index 6eb9600cf8b..385c5326c97 100644
--- a/src/test/run-pass/segfault-no-out-of-stack.rs
+++ b/src/test/run-pass/segfault-no-out-of-stack.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(old_io)]
 
diff --git a/src/test/run-pass/self-in-mut-slot-default-method.rs b/src/test/run-pass/self-in-mut-slot-default-method.rs
index f8502137be1..877988e60a9 100644
--- a/src/test/run-pass/self-in-mut-slot-default-method.rs
+++ b/src/test/run-pass/self-in-mut-slot-default-method.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/self-in-mut-slot-immediate-value.rs b/src/test/run-pass/self-in-mut-slot-immediate-value.rs
index fa9ad9f6517..24014c289f9 100644
--- a/src/test/run-pass/self-in-mut-slot-immediate-value.rs
+++ b/src/test/run-pass/self-in-mut-slot-immediate-value.rs
@@ -11,7 +11,6 @@
 // Assert that `mut self` on an immediate value doesn't
 // allow mutating the original - issue #10615.
 
-// pretty-expanded FIXME #23616
 
 #[derive(Copy, Clone)]
 struct Value {
diff --git a/src/test/run-pass/self-re-assign.rs b/src/test/run-pass/self-re-assign.rs
index b3c81cab3c1..7314a65b60c 100644
--- a/src/test/run-pass/self-re-assign.rs
+++ b/src/test/run-pass/self-re-assign.rs
@@ -11,7 +11,6 @@
 // Ensure assigning an owned or managed variable to itself works. In particular,
 // that we do not glue_drop before we glue_take (#3290).
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/self-shadowing-import.rs b/src/test/run-pass/self-shadowing-import.rs
index 5de1686ef9d..cd47a0e86bd 100644
--- a/src/test/run-pass/self-shadowing-import.rs
+++ b/src/test/run-pass/self-shadowing-import.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod a {
     pub mod b {
diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/run-pass/send_str_hashmap.rs
index 16a695f08fe..2501ef94bea 100644
--- a/src/test/run-pass/send_str_hashmap.rs
+++ b/src/test/run-pass/send_str_hashmap.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections, into_cow)]
 
diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs
index d56657ee4d5..146f5253508 100644
--- a/src/test/run-pass/send_str_treemap.rs
+++ b/src/test/run-pass/send_str_treemap.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections, into_cow)]
 
diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/run-pass/sendfn-is-a-block.rs
index 59b92ec6a48..162b05f0bb3 100644
--- a/src/test/run-pass/sendfn-is-a-block.rs
+++ b/src/test/run-pass/sendfn-is-a-block.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 fn test<F>(f: F) -> usize where F: FnOnce(usize) -> usize {
     return f(22);
diff --git a/src/test/run-pass/sepcomp-cci.rs b/src/test/run-pass/sepcomp-cci.rs
index a4d74dbd55a..a1c5ad113c7 100644
--- a/src/test/run-pass/sepcomp-cci.rs
+++ b/src/test/run-pass/sepcomp-cci.rs
@@ -14,7 +14,6 @@
 
 // Test accessing cross-crate inlined items from multiple compilation units.
 
-// pretty-expanded FIXME #23616
 
 extern crate sepcomp_cci_lib;
 use sepcomp_cci_lib::{cci_fn, CCI_STATIC};
diff --git a/src/test/run-pass/sepcomp-extern.rs b/src/test/run-pass/sepcomp-extern.rs
index 3ec27466f4c..973c61712c3 100644
--- a/src/test/run-pass/sepcomp-extern.rs
+++ b/src/test/run-pass/sepcomp-extern.rs
@@ -14,7 +14,6 @@
 
 // Test accessing external items from multiple compilation units.
 
-// pretty-expanded FIXME #23616
 
 #[link(name = "sepcomp_extern_lib")]
 extern {
diff --git a/src/test/run-pass/sepcomp-fns-backwards.rs b/src/test/run-pass/sepcomp-fns-backwards.rs
index cd101bb2064..1ab8bc7f88c 100644
--- a/src/test/run-pass/sepcomp-fns-backwards.rs
+++ b/src/test/run-pass/sepcomp-fns-backwards.rs
@@ -16,7 +16,6 @@
 // Generate some code in the first compilation unit before declaring any
 // modules.  This ensures that the first module doesn't go into the same
 // compilation unit as the top-level module.
-// pretty-expanded FIXME #23616
 
 fn pad() -> usize { 0 }
 
diff --git a/src/test/run-pass/sepcomp-fns.rs b/src/test/run-pass/sepcomp-fns.rs
index b76c24bfc18..a2356cf02a1 100644
--- a/src/test/run-pass/sepcomp-fns.rs
+++ b/src/test/run-pass/sepcomp-fns.rs
@@ -18,7 +18,6 @@
 // Generate some code in the first compilation unit before declaring any
 // modules.  This ensures that the first module doesn't go into the same
 // compilation unit as the top-level module.
-// pretty-expanded FIXME #23616
 
 fn one() -> usize { 1 }
 
diff --git a/src/test/run-pass/sepcomp-lib.rs b/src/test/run-pass/sepcomp-lib.rs
index 00e83a57057..abe842a332d 100644
--- a/src/test/run-pass/sepcomp-lib.rs
+++ b/src/test/run-pass/sepcomp-lib.rs
@@ -12,7 +12,6 @@
 
 // Test linking against a library built with -C codegen-units > 1
 
-// pretty-expanded FIXME #23616
 
 extern crate sepcomp_lib;
 use sepcomp_lib::a::one;
diff --git a/src/test/run-pass/sepcomp-statics.rs b/src/test/run-pass/sepcomp-statics.rs
index f10f25a58bf..8cda469a88b 100644
--- a/src/test/run-pass/sepcomp-statics.rs
+++ b/src/test/run-pass/sepcomp-statics.rs
@@ -13,7 +13,6 @@
 
 // Test references to static items across compilation units.
 
-// pretty-expanded FIXME #23616
 
 fn pad() -> usize { 0 }
 
diff --git a/src/test/run-pass/sepcomp-unwind.rs b/src/test/run-pass/sepcomp-unwind.rs
index 9663679d09a..766e2b6b722 100644
--- a/src/test/run-pass/sepcomp-unwind.rs
+++ b/src/test/run-pass/sepcomp-unwind.rs
@@ -20,7 +20,6 @@
 // In any case, this test should let us know if enabling parallel codegen ever
 // breaks unwinding.
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs
index 743f54abcfa..f1a21d90ab2 100644
--- a/src/test/run-pass/seq-compare.rs
+++ b/src/test/run-pass/seq-compare.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert!(("hello".to_string() < "hellr".to_string()));
diff --git a/src/test/run-pass/shift-various-types.rs b/src/test/run-pass/shift-various-types.rs
index b0ab72c650d..9238112a081 100644
--- a/src/test/run-pass/shift-various-types.rs
+++ b/src/test/run-pass/shift-various-types.rs
@@ -10,7 +10,6 @@
 
 // Test that we can do shifts by any integral type.
 
-// pretty-expanded FIXME #23616
 
 struct Panolpy {
     i8: i8,
diff --git a/src/test/run-pass/shift.rs b/src/test/run-pass/shift.rs
index f1637fe1e09..2f417e0e2f4 100644
--- a/src/test/run-pass/shift.rs
+++ b/src/test/run-pass/shift.rs
@@ -11,7 +11,6 @@
 // Testing shifts for various combinations of integers
 // Issue #1570
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     test_misc();
diff --git a/src/test/run-pass/signed-shift-const-eval.rs b/src/test/run-pass/signed-shift-const-eval.rs
index 71672364380..9ea2dedcba1 100644
--- a/src/test/run-pass/signed-shift-const-eval.rs
+++ b/src/test/run-pass/signed-shift-const-eval.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum test { thing = -5 >> 1_usize }
 pub fn main() {
diff --git a/src/test/run-pass/sigpipe-should-be-ignored.rs b/src/test/run-pass/sigpipe-should-be-ignored.rs
index 4a05b487ae2..7734a2e80c3 100644
--- a/src/test/run-pass/sigpipe-should-be-ignored.rs
+++ b/src/test/run-pass/sigpipe-should-be-ignored.rs
@@ -12,7 +12,6 @@
 // doesn't die in a ball of fire, but rather it's gracefully handled.
 
 // ignore-aarch64
-// pretty-expanded FIXME #23616
 
 use std::env;
 use std::io::prelude::*;
diff --git a/src/test/run-pass/simd-binop.rs b/src/test/run-pass/simd-binop.rs
index 9f7b78e4e33..3ebf2a87361 100644
--- a/src/test/run-pass/simd-binop.rs
+++ b/src/test/run-pass/simd-binop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/simd-generics.rs b/src/test/run-pass/simd-generics.rs
index 867f028a3fb..0e3d6b83a4b 100644
--- a/src/test/run-pass/simd-generics.rs
+++ b/src/test/run-pass/simd-generics.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #![feature(simd)]
 
diff --git a/src/test/run-pass/simd-size-align.rs b/src/test/run-pass/simd-size-align.rs
index 8324efc6417..025b2a77375 100644
--- a/src/test/run-pass/simd-size-align.rs
+++ b/src/test/run-pass/simd-size-align.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(simd)]
 #![allow(non_camel_case_types)]
diff --git a/src/test/run-pass/slice-2.rs b/src/test/run-pass/slice-2.rs
index 7f34b94ad04..4762470a747 100644
--- a/src/test/run-pass/slice-2.rs
+++ b/src/test/run-pass/slice-2.rs
@@ -10,7 +10,6 @@
 
 // Test slicing expressions on slices and Vecs.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let x: &[isize] = &[1, 2, 3, 4, 5];
diff --git a/src/test/run-pass/slice-panic-1.rs b/src/test/run-pass/slice-panic-1.rs
index a4f737f7461..854b03f9178 100644
--- a/src/test/run-pass/slice-panic-1.rs
+++ b/src/test/run-pass/slice-panic-1.rs
@@ -10,7 +10,6 @@
 
 // Test that if a slicing expr[..] fails, the correct cleanups happen.
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/slice-panic-2.rs b/src/test/run-pass/slice-panic-2.rs
index f02a84b9070..42a19342884 100644
--- a/src/test/run-pass/slice-panic-2.rs
+++ b/src/test/run-pass/slice-panic-2.rs
@@ -10,7 +10,6 @@
 
 // Test that if a slicing expr[..] fails, the correct cleanups happen.
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/slice.rs b/src/test/run-pass/slice.rs
index edc5f6b1846..60160bd668f 100644
--- a/src/test/run-pass/slice.rs
+++ b/src/test/run-pass/slice.rs
@@ -10,7 +10,6 @@
 
 // Test slicing sugar.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/small-enum-range-edge.rs b/src/test/run-pass/small-enum-range-edge.rs
index 9515da6fcbc..56abdf6e20a 100644
--- a/src/test/run-pass/small-enum-range-edge.rs
+++ b/src/test/run-pass/small-enum-range-edge.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 // this is for the wrapping_add call below.
 #![feature(core)]
diff --git a/src/test/run-pass/spawn-types.rs b/src/test/run-pass/spawn-types.rs
index aab292a940a..ae4fabd34d6 100644
--- a/src/test/run-pass/spawn-types.rs
+++ b/src/test/run-pass/spawn-types.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 /*
   Make sure we can spawn tasks that take different types of
diff --git a/src/test/run-pass/stable-addr-of.rs b/src/test/run-pass/stable-addr-of.rs
index f93600195dc..5ffceb2c6a8 100644
--- a/src/test/run-pass/stable-addr-of.rs
+++ b/src/test/run-pass/stable-addr-of.rs
@@ -10,7 +10,6 @@
 
 // Issue #2040
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let foo: isize = 1;
diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/run-pass/static-function-pointer-xc.rs
index 55f3b0883b9..a09928bd220 100644
--- a/src/test/run-pass/static-function-pointer-xc.rs
+++ b/src/test/run-pass/static-function-pointer-xc.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:static-function-pointer-aux.rs
-// pretty-expanded FIXME #23616
 
 extern crate static_function_pointer_aux as aux;
 
diff --git a/src/test/run-pass/static-function-pointer.rs b/src/test/run-pass/static-function-pointer.rs
index 67cc033f7cf..be297524309 100644
--- a/src/test/run-pass/static-function-pointer.rs
+++ b/src/test/run-pass/static-function-pointer.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f(x: isize) -> isize { x }
 fn g(x: isize) -> isize { 2 * x }
diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs
index aff2797c1ac..84bb1b871b9 100644
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/run-pass/static-impl.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub trait plus {
     fn plus(&self) -> isize;
diff --git a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs b/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs
index 4ccb044bbd2..c2b3a9a7228 100644
--- a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs
+++ b/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Deserializer {
     fn read_int(&self) -> isize;
diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs
index d0b69b430a6..57609cec9f2 100644
--- a/src/test/run-pass/static-method-xcrate.rs
+++ b/src/test/run-pass/static-method-xcrate.rs
@@ -10,7 +10,6 @@
 
 // aux-build:static-methods-crate.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate static_methods_crate;
 
diff --git a/src/test/run-pass/static-methods-in-traits.rs b/src/test/run-pass/static-methods-in-traits.rs
index cb23feb05a5..3fd3bbe936f 100644
--- a/src/test/run-pass/static-methods-in-traits.rs
+++ b/src/test/run-pass/static-methods-in-traits.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod a {
     pub trait Foo {
diff --git a/src/test/run-pass/static-mut-foreign.rs b/src/test/run-pass/static-mut-foreign.rs
index c6b919c9738..b916a1ae2be 100644
--- a/src/test/run-pass/static-mut-foreign.rs
+++ b/src/test/run-pass/static-mut-foreign.rs
@@ -12,7 +12,6 @@
 // statics cannot. This ensures that there's some form of error if this is
 // attempted.
 
-// pretty-expanded FIXME #23616
 
 #![feature(libc)]
 
diff --git a/src/test/run-pass/static-mut-xc.rs b/src/test/run-pass/static-mut-xc.rs
index 0456d17bdc4..c819db94547 100644
--- a/src/test/run-pass/static-mut-xc.rs
+++ b/src/test/run-pass/static-mut-xc.rs
@@ -14,7 +14,6 @@
 
 // aux-build:static_mut_xc.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate static_mut_xc;
 
diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs
index 0d0d56fcafb..94e14290498 100644
--- a/src/test/run-pass/str-multiline.rs
+++ b/src/test/run-pass/str-multiline.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let a: String = "this \
diff --git a/src/test/run-pass/string-escapes.rs b/src/test/run-pass/string-escapes.rs
index e0fc1c4ce46..1d13e531004 100644
--- a/src/test/run-pass/string-escapes.rs
+++ b/src/test/run-pass/string-escapes.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let x = "\\\\\
diff --git a/src/test/run-pass/struct-aliases-xcrate.rs b/src/test/run-pass/struct-aliases-xcrate.rs
index 17cb8acea6f..2ca9d599d84 100644
--- a/src/test/run-pass/struct-aliases-xcrate.rs
+++ b/src/test/run-pass/struct-aliases-xcrate.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:xcrate_struct_aliases.rs
-// pretty-expanded FIXME #23616
 
 extern crate xcrate_struct_aliases;
 
diff --git a/src/test/run-pass/struct-aliases.rs b/src/test/run-pass/struct-aliases.rs
index 79e7960cfb2..7107243d760 100644
--- a/src/test/run-pass/struct-aliases.rs
+++ b/src/test/run-pass/struct-aliases.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct S {
     x: isize,
diff --git a/src/test/run-pass/struct-destructuring-cross-crate.rs b/src/test/run-pass/struct-destructuring-cross-crate.rs
index 5fed712bd66..63e8d694ddb 100644
--- a/src/test/run-pass/struct-destructuring-cross-crate.rs
+++ b/src/test/run-pass/struct-destructuring-cross-crate.rs
@@ -10,7 +10,6 @@
 
 // aux-build:struct_destructuring_cross_crate.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate struct_destructuring_cross_crate;
 
diff --git a/src/test/run-pass/struct-like-variant-match.rs b/src/test/run-pass/struct-like-variant-match.rs
index f072d315d72..175090eadd9 100644
--- a/src/test/run-pass/struct-like-variant-match.rs
+++ b/src/test/run-pass/struct-like-variant-match.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum Foo {
     Bar {
diff --git a/src/test/run-pass/struct-new-as-field-name.rs b/src/test/run-pass/struct-new-as-field-name.rs
index 73f27448f81..7fb3a64e02b 100644
--- a/src/test/run-pass/struct-new-as-field-name.rs
+++ b/src/test/run-pass/struct-new-as-field-name.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo {
     new: isize,
diff --git a/src/test/run-pass/struct-order-of-eval-1.rs b/src/test/run-pass/struct-order-of-eval-1.rs
index 49ec695a122..b5e4011bbea 100644
--- a/src/test/run-pass/struct-order-of-eval-1.rs
+++ b/src/test/run-pass/struct-order-of-eval-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct S { f0: String, f1: isize }
 
diff --git a/src/test/run-pass/struct-order-of-eval-2.rs b/src/test/run-pass/struct-order-of-eval-2.rs
index 45755608ff5..7ec28f597ed 100644
--- a/src/test/run-pass/struct-order-of-eval-2.rs
+++ b/src/test/run-pass/struct-order-of-eval-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct S {
     f0: String,
diff --git a/src/test/run-pass/struct-order-of-eval-3.rs b/src/test/run-pass/struct-order-of-eval-3.rs
index 37b6de8e17e..60f9c4465a0 100644
--- a/src/test/run-pass/struct-order-of-eval-3.rs
+++ b/src/test/run-pass/struct-order-of-eval-3.rs
@@ -11,7 +11,6 @@
 // Checks that functional-record-update order-of-eval is as expected
 // even when no Drop-implementations are involved.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::atomic::{Ordering, AtomicUsize, ATOMIC_USIZE_INIT};
 
diff --git a/src/test/run-pass/struct-order-of-eval-4.rs b/src/test/run-pass/struct-order-of-eval-4.rs
index 1b53895f7d1..23a7e1ea71b 100644
--- a/src/test/run-pass/struct-order-of-eval-4.rs
+++ b/src/test/run-pass/struct-order-of-eval-4.rs
@@ -11,7 +11,6 @@
 // Checks that struct-literal expression order-of-eval is as expected
 // even when no Drop-implementations are involved.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::atomic::{Ordering, AtomicUsize, ATOMIC_USIZE_INIT};
 
diff --git a/src/test/run-pass/struct_variant_xc_match.rs b/src/test/run-pass/struct_variant_xc_match.rs
index f43dd2332a1..3ceb65bcfde 100644
--- a/src/test/run-pass/struct_variant_xc_match.rs
+++ b/src/test/run-pass/struct_variant_xc_match.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:struct_variant_xc_aux.rs
-// pretty-expanded FIXME #23616
 
 extern crate struct_variant_xc_aux;
 
diff --git a/src/test/run-pass/supertrait-default-generics.rs b/src/test/run-pass/supertrait-default-generics.rs
index 351c4259b5e..e014ce1966b 100644
--- a/src/test/run-pass/supertrait-default-generics.rs
+++ b/src/test/run-pass/supertrait-default-generics.rs
@@ -10,7 +10,6 @@
 
 // There is some other borrowck bug, so we make the stuff not mut.
 
-// pretty-expanded FIXME #23616
 
 use std::ops::Add;
 
diff --git a/src/test/run-pass/swap-1.rs b/src/test/run-pass/swap-1.rs
index e60c672f00f..d84ee104514 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/run-pass/swap-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::swap;
 
diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs
index 3891376e463..3dbd7f1a601 100644
--- a/src/test/run-pass/swap-2.rs
+++ b/src/test/run-pass/swap-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::swap;
 
diff --git a/src/test/run-pass/syntax-extension-cfg.rs b/src/test/run-pass/syntax-extension-cfg.rs
index 8766cba5dbb..c1d8713b20e 100644
--- a/src/test/run-pass/syntax-extension-cfg.rs
+++ b/src/test/run-pass/syntax-extension-cfg.rs
@@ -10,7 +10,6 @@
 
 // compile-flags: --cfg foo --cfg qux="foo"
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     // check
diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/run-pass/tag-align-dyn-u64.rs
index a9f5875023f..aaac1869af5 100644
--- a/src/test/run-pass/tag-align-dyn-u64.rs
+++ b/src/test/run-pass/tag-align-dyn-u64.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/run-pass/tag-align-dyn-variants.rs
index 90b583e2e50..1c3fb209e35 100644
--- a/src/test/run-pass/tag-align-dyn-variants.rs
+++ b/src/test/run-pass/tag-align-dyn-variants.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/run-pass/tag-align-u64.rs
index e922ac3b466..43485a5bfcb 100644
--- a/src/test/run-pass/tag-align-u64.rs
+++ b/src/test/run-pass/tag-align-u64.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/tag-variant-disr-val.rs b/src/test/run-pass/tag-variant-disr-val.rs
index a063801032e..6dc69656759 100644
--- a/src/test/run-pass/tag-variant-disr-val.rs
+++ b/src/test/run-pass/tag-variant-disr-val.rs
@@ -7,7 +7,6 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-// pretty-expanded FIXME #23616
 
 use color::{red, green, blue, black, white, imaginary, purple, orange};
 
diff --git a/src/test/run-pass/tag.rs b/src/test/run-pass/tag.rs
index dbd65ee6bd4..e3cfceb0d42 100644
--- a/src/test/run-pass/tag.rs
+++ b/src/test/run-pass/tag.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 enum colour { red(isize, isize), green, }
 
diff --git a/src/test/run-pass/tail-direct.rs b/src/test/run-pass/tail-direct.rs
index 01fc18af343..4a7a0acdfa8 100644
--- a/src/test/run-pass/tail-direct.rs
+++ b/src/test/run-pass/tail-direct.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() { assert!((even(42))); assert!((odd(45))); }
 
diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs
index cd3d97b88ba..cd5cb677d46 100644
--- a/src/test/run-pass/task-comm-5.rs
+++ b/src/test/run-pass/task-comm-5.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::channel;
 
diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs
index 80e777d242c..b8b5773ade5 100644
--- a/src/test/run-pass/task-comm-6.rs
+++ b/src/test/run-pass/task-comm-6.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
 
diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs
index 77571504fea..3b9ec421691 100644
--- a/src/test/run-pass/task-comm-chan-nil.rs
+++ b/src/test/run-pass/task-comm-chan-nil.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::mpsc::channel;
 
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs
index ec9e7de40dc..83eb351df53 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/run-pass/terminate-in-initializer.rs
@@ -12,7 +12,6 @@
 // Issue #787
 // Don't try to clean up uninitialized locals
 
-// pretty-expanded FIXME #23616
 
 use std::thread;
 
diff --git a/src/test/run-pass/trait-bounds.rs b/src/test/run-pass/trait-bounds.rs
index 642119df15c..d501fef122c 100644
--- a/src/test/run-pass/trait-bounds.rs
+++ b/src/test/run-pass/trait-bounds.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait connection {
     fn read(&self) -> isize;
diff --git a/src/test/run-pass/trait-default-method-bound-subst.rs b/src/test/run-pass/trait-default-method-bound-subst.rs
index e936989537e..b9936bcadd4 100644
--- a/src/test/run-pass/trait-default-method-bound-subst.rs
+++ b/src/test/run-pass/trait-default-method-bound-subst.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait A<T> {
     fn g<U>(&self, x: T, y: U) -> (T, U) { (x, y) }
diff --git a/src/test/run-pass/trait-default-method-bound-subst2.rs b/src/test/run-pass/trait-default-method-bound-subst2.rs
index 4fedbba81f4..92b9449461b 100644
--- a/src/test/run-pass/trait-default-method-bound-subst2.rs
+++ b/src/test/run-pass/trait-default-method-bound-subst2.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait A<T> {
     fn g(&self, x: T) -> T { x }
diff --git a/src/test/run-pass/trait-default-method-bound-subst3.rs b/src/test/run-pass/trait-default-method-bound-subst3.rs
index 4f749cbd3fd..af7e8830332 100644
--- a/src/test/run-pass/trait-default-method-bound-subst3.rs
+++ b/src/test/run-pass/trait-default-method-bound-subst3.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait A {
     fn g<T>(&self, x: T, y: T) -> (T, T) { (x, y) }
diff --git a/src/test/run-pass/trait-default-method-bound-subst4.rs b/src/test/run-pass/trait-default-method-bound-subst4.rs
index 6774569cd25..581a54e57f4 100644
--- a/src/test/run-pass/trait-default-method-bound-subst4.rs
+++ b/src/test/run-pass/trait-default-method-bound-subst4.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait A<T> {
     fn g(&self, x: usize) -> usize { x }
diff --git a/src/test/run-pass/trait-default-method-bound.rs b/src/test/run-pass/trait-default-method-bound.rs
index 4107540a471..e0ea9651f61 100644
--- a/src/test/run-pass/trait-default-method-bound.rs
+++ b/src/test/run-pass/trait-default-method-bound.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait A {
     fn g(&self) -> isize { 10 }
diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/run-pass/trait-default-method-xc-2.rs
index d4ed7270400..833063d2a2d 100644
--- a/src/test/run-pass/trait-default-method-xc-2.rs
+++ b/src/test/run-pass/trait-default-method-xc-2.rs
@@ -12,7 +12,6 @@
 // aux-build:trait_default_method_xc_aux_2.rs
 
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_default_method_xc_aux as aux;
 extern crate trait_default_method_xc_aux_2 as aux2;
diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs
index 65e8c53a25e..72e3fb256ca 100644
--- a/src/test/run-pass/trait-default-method-xc.rs
+++ b/src/test/run-pass/trait-default-method-xc.rs
@@ -10,7 +10,6 @@
 
 // aux-build:trait_default_method_xc_aux.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_default_method_xc_aux as aux;
 use aux::{A, TestEquality, Something};
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs
index 6ef0dacee74..49982366291 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/src/test/run-pass/trait-generic.rs
@@ -10,7 +10,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 trait to_str {
     fn to_string_(&self) -> String;
diff --git a/src/test/run-pass/trait-impl.rs b/src/test/run-pass/trait-impl.rs
index 95fd7bda474..10025a76f79 100644
--- a/src/test/run-pass/trait-impl.rs
+++ b/src/test/run-pass/trait-impl.rs
@@ -11,7 +11,6 @@
 // Test calling methods on an impl for a bare trait.
 
 // aux-build:traitimpl.rs
-// pretty-expanded FIXME #23616
 
 extern crate traitimpl;
 use traitimpl::Bar;
diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
index 128be2993ec..270cf652ed7 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs
+++ b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
@@ -10,7 +10,6 @@
 
 // aux-build:trait_inheritance_auto_xc_2_aux.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_inheritance_auto_xc_2_aux as aux;
 
diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/run-pass/trait-inheritance-auto-xc.rs
index 827674c81ad..eaca60c935a 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc.rs
+++ b/src/test/run-pass/trait-inheritance-auto-xc.rs
@@ -10,7 +10,6 @@
 
 // aux-build:trait_inheritance_auto_xc_aux.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_inheritance_auto_xc_aux as aux;
 
diff --git a/src/test/run-pass/trait-inheritance-auto.rs b/src/test/run-pass/trait-inheritance-auto.rs
index 1b72736cde4..75c48d51712 100644
--- a/src/test/run-pass/trait-inheritance-auto.rs
+++ b/src/test/run-pass/trait-inheritance-auto.rs
@@ -10,7 +10,6 @@
 
 // Testing that this impl turns A into a Quux, because
 // A is already a Foo Bar Baz
-// pretty-expanded FIXME #23616
 
 impl<T:Foo + Bar + Baz> Quux for T { }
 
diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs b/src/test/run-pass/trait-inheritance-call-bound-inherited.rs
index c8df12392fa..2fb2b9274c6 100644
--- a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs
+++ b/src/test/run-pass/trait-inheritance-call-bound-inherited.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo { fn f(&self) -> isize; }
 trait Bar : Foo { fn g(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs b/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs
index fcd6143579c..87dc04f1c66 100644
--- a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs
+++ b/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo { fn f(&self) -> isize; }
 trait Bar : Foo { fn g(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs b/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs
index 3996ae850e8..dd61dc0f9fb 100644
--- a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs
+++ b/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs
@@ -11,7 +11,6 @@
 // Testing that we can cast to a subtrait and call subtrait
 // methods. Not testing supertrait methods
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn f(&self) -> isize;
diff --git a/src/test/run-pass/trait-inheritance-cast.rs b/src/test/run-pass/trait-inheritance-cast.rs
index 7784ed2f26a..0de2c586930 100644
--- a/src/test/run-pass/trait-inheritance-cast.rs
+++ b/src/test/run-pass/trait-inheritance-cast.rs
@@ -10,7 +10,6 @@
 
 // Testing that supertrait methods can be called on subtrait object types
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn f(&self) -> isize;
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
index c665c35b418..e1610c1db07 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
+++ b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
@@ -10,7 +10,6 @@
 
 // aux-build:trait_inheritance_cross_trait_call_xc_aux.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_inheritance_cross_trait_call_xc_aux as aux;
 
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call.rs b/src/test/run-pass/trait-inheritance-cross-trait-call.rs
index 418986f961e..27b0f66603f 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call.rs
+++ b/src/test/run-pass/trait-inheritance-cross-trait-call.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo { fn f(&self) -> isize; }
 trait Bar : Foo { fn g(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-diamond.rs b/src/test/run-pass/trait-inheritance-diamond.rs
index 07b1a79110f..43151bb0f99 100644
--- a/src/test/run-pass/trait-inheritance-diamond.rs
+++ b/src/test/run-pass/trait-inheritance-diamond.rs
@@ -10,7 +10,6 @@
 
 // B and C both require A, so D does as well, twice, but that's just fine
 
-// pretty-expanded FIXME #23616
 
 trait A { fn a(&self) -> isize; }
 trait B: A { fn b(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs b/src/test/run-pass/trait-inheritance-multiple-inheritors.rs
index b8924626954..8125ce20912 100644
--- a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs
+++ b/src/test/run-pass/trait-inheritance-multiple-inheritors.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait A { fn a(&self) -> isize; }
 trait B: A { fn b(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-multiple-params.rs b/src/test/run-pass/trait-inheritance-multiple-params.rs
index 37803edb752..c0f7a9d9c25 100644
--- a/src/test/run-pass/trait-inheritance-multiple-params.rs
+++ b/src/test/run-pass/trait-inheritance-multiple-params.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait A { fn a(&self) -> isize; }
 trait B: A { fn b(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs
index f44c6927c87..21d6c53a465 100644
--- a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs
+++ b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs
@@ -10,7 +10,6 @@
 
 // aux-build:trait_inheritance_overloading_xc.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_inheritance_overloading_xc;
 use trait_inheritance_overloading_xc::{MyNum, MyInt};
diff --git a/src/test/run-pass/trait-inheritance-self-in-supertype.rs b/src/test/run-pass/trait-inheritance-self-in-supertype.rs
index 87a36ba7b90..ac9485594eb 100644
--- a/src/test/run-pass/trait-inheritance-self-in-supertype.rs
+++ b/src/test/run-pass/trait-inheritance-self-in-supertype.rs
@@ -10,7 +10,6 @@
 
 // Test for issue #4183: use of Self in supertraits.
 
-// pretty-expanded FIXME #23616
 
 use std::num::Float as StdFloat;
 
diff --git a/src/test/run-pass/trait-inheritance-simple.rs b/src/test/run-pass/trait-inheritance-simple.rs
index ff89b1ee5d3..917e520339a 100644
--- a/src/test/run-pass/trait-inheritance-simple.rs
+++ b/src/test/run-pass/trait-inheritance-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo { fn f(&self) -> isize; }
 trait Bar : Foo { fn g(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance-static.rs b/src/test/run-pass/trait-inheritance-static.rs
index 9ed5fd0aaa5..8e565829511 100644
--- a/src/test/run-pass/trait-inheritance-static.rs
+++ b/src/test/run-pass/trait-inheritance-static.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub trait MyNum {
     fn from_int(isize) -> Self;
diff --git a/src/test/run-pass/trait-inheritance-static2.rs b/src/test/run-pass/trait-inheritance-static2.rs
index 9fe9d7fce7a..62feecf045b 100644
--- a/src/test/run-pass/trait-inheritance-static2.rs
+++ b/src/test/run-pass/trait-inheritance-static2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/trait-inheritance-subst.rs b/src/test/run-pass/trait-inheritance-subst.rs
index d35a937a573..6074c8a71b0 100644
--- a/src/test/run-pass/trait-inheritance-subst.rs
+++ b/src/test/run-pass/trait-inheritance-subst.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub trait Add<RHS,Result> {
     fn add(&self, rhs: &RHS) -> Result;
diff --git a/src/test/run-pass/trait-inheritance-subst2.rs b/src/test/run-pass/trait-inheritance-subst2.rs
index e0be5759503..6a363995435 100644
--- a/src/test/run-pass/trait-inheritance-subst2.rs
+++ b/src/test/run-pass/trait-inheritance-subst2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Panda<T> {
     fn chomp(&self, bamboo: &T) -> T;
diff --git a/src/test/run-pass/trait-inheritance-visibility.rs b/src/test/run-pass/trait-inheritance-visibility.rs
index 8c8b9232dee..f00a4f2ecb6 100644
--- a/src/test/run-pass/trait-inheritance-visibility.rs
+++ b/src/test/run-pass/trait-inheritance-visibility.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 mod traits {
     pub trait Foo { fn f(&self) -> isize; }
diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/run-pass/trait-inheritance2.rs
index 9e721836d63..2161c0f894f 100644
--- a/src/test/run-pass/trait-inheritance2.rs
+++ b/src/test/run-pass/trait-inheritance2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 trait Foo { fn f(&self) -> isize; }
 trait Bar { fn g(&self) -> isize; }
diff --git a/src/test/run-pass/trait-object-generics.rs b/src/test/run-pass/trait-object-generics.rs
index 63246b870cb..15a8a2e83e3 100644
--- a/src/test/run-pass/trait-object-generics.rs
+++ b/src/test/run-pass/trait-object-generics.rs
@@ -10,7 +10,6 @@
 
 // test for #8664
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/trait-object-with-lifetime-bound.rs b/src/test/run-pass/trait-object-with-lifetime-bound.rs
index 30a05ee1c56..21b84221d06 100644
--- a/src/test/run-pass/trait-object-with-lifetime-bound.rs
+++ b/src/test/run-pass/trait-object-with-lifetime-bound.rs
@@ -11,7 +11,6 @@
 // Uncovered during work on new scoping rules for safe destructors
 // as an important use case to support properly.
 
-// pretty-expanded FIXME #23616
 
 pub struct E<'a> {
     pub f: &'a u8,
diff --git a/src/test/run-pass/trait-safety-ok-cc.rs b/src/test/run-pass/trait-safety-ok-cc.rs
index ada79399561..abbc556f34e 100644
--- a/src/test/run-pass/trait-safety-ok-cc.rs
+++ b/src/test/run-pass/trait-safety-ok-cc.rs
@@ -12,7 +12,6 @@
 
 // Simple smoke test that unsafe traits can be compiled across crates.
 
-// pretty-expanded FIXME #23616
 
 extern crate trait_safety_lib as lib;
 
diff --git a/src/test/run-pass/trait-safety-ok.rs b/src/test/run-pass/trait-safety-ok.rs
index 3cd23aeaf27..0ccc6cd152d 100644
--- a/src/test/run-pass/trait-safety-ok.rs
+++ b/src/test/run-pass/trait-safety-ok.rs
@@ -10,7 +10,6 @@
 
 // Simple smoke test that unsafe traits can be compiled etc.
 
-// pretty-expanded FIXME #23616
 
 unsafe trait Foo {
     fn foo(&self) -> isize;
diff --git a/src/test/run-pass/traits-assoc-type-in-supertrait.rs b/src/test/run-pass/traits-assoc-type-in-supertrait.rs
index 751cd504413..5cecacafc74 100644
--- a/src/test/run-pass/traits-assoc-type-in-supertrait.rs
+++ b/src/test/run-pass/traits-assoc-type-in-supertrait.rs
@@ -11,7 +11,6 @@
 // Test case where an associated type is referenced from within the
 // supertrait definition. Issue #20220.
 
-// pretty-expanded FIXME #23616
 
 use std::vec::IntoIter;
 
diff --git a/src/test/run-pass/traits-conditional-dispatch.rs b/src/test/run-pass/traits-conditional-dispatch.rs
index 0a6b9da74f2..8d2faaf418b 100644
--- a/src/test/run-pass/traits-conditional-dispatch.rs
+++ b/src/test/run-pass/traits-conditional-dispatch.rs
@@ -12,7 +12,6 @@
 // blanket impl for T:Copy coexists with an impl for Box<T>, because
 // Box does not impl Copy.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/traits-conditional-model-fn.rs b/src/test/run-pass/traits-conditional-model-fn.rs
index 65a48844620..d19f7143ed2 100644
--- a/src/test/run-pass/traits-conditional-model-fn.rs
+++ b/src/test/run-pass/traits-conditional-model-fn.rs
@@ -14,7 +14,6 @@
 
 // aux-build:go_trait.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate go_trait;
 
diff --git a/src/test/run-pass/traits-default-method-macro.rs b/src/test/run-pass/traits-default-method-macro.rs
index 1ec58eac58b..193038d9e50 100644
--- a/src/test/run-pass/traits-default-method-macro.rs
+++ b/src/test/run-pass/traits-default-method-macro.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn bar(&self) -> String {
diff --git a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs b/src/test/run-pass/traits-multidispatch-infer-convert-target.rs
index 1f1d1a46cf9..6634c1ad0a2 100644
--- a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs
+++ b/src/test/run-pass/traits-multidispatch-infer-convert-target.rs
@@ -10,7 +10,6 @@
 
 // Test that we can infer the Target based on the Self or vice versa.
 
-// pretty-expanded FIXME #23616
 
 use std::mem;
 
diff --git a/src/test/run-pass/traits-repeated-supertrait.rs b/src/test/run-pass/traits-repeated-supertrait.rs
index 509a6e36afd..b059945ef74 100644
--- a/src/test/run-pass/traits-repeated-supertrait.rs
+++ b/src/test/run-pass/traits-repeated-supertrait.rs
@@ -13,7 +13,6 @@
 // various methods in various ways successfully.
 // See also `compile-fail/trait-repeated-supertrait-ambig.rs`.
 
-// pretty-expanded FIXME #23616
 
 trait CompareTo<T> {
     fn same_as(&self, t: T) -> bool;
diff --git a/src/test/run-pass/trans-tag-static-padding.rs b/src/test/run-pass/trans-tag-static-padding.rs
index 3e2297f008f..ba01d51dc6a 100644
--- a/src/test/run-pass/trans-tag-static-padding.rs
+++ b/src/test/run-pass/trans-tag-static-padding.rs
@@ -21,7 +21,6 @@
 // Last 7 bytes of Request struct are not occupied by any fields.
 
 
-// pretty-expanded FIXME #23616
 
 enum TestOption<T> {
     TestNone,
diff --git a/src/test/run-pass/tup.rs b/src/test/run-pass/tup.rs
index 50687756e2a..86ca37deb02 100644
--- a/src/test/run-pass/tup.rs
+++ b/src/test/run-pass/tup.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 type point = (isize, isize);
 
diff --git a/src/test/run-pass/tuple-index-fat-types.rs b/src/test/run-pass/tuple-index-fat-types.rs
index 395531d1573..e4ea073bfc2 100644
--- a/src/test/run-pass/tuple-index-fat-types.rs
+++ b/src/test/run-pass/tuple-index-fat-types.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Foo<'a>(&'a [isize]);
 
diff --git a/src/test/run-pass/tuple-index.rs b/src/test/run-pass/tuple-index.rs
index a70b49296fa..26d918f2367 100644
--- a/src/test/run-pass/tuple-index.rs
+++ b/src/test/run-pass/tuple-index.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct Point(isize, isize);
 
diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/run-pass/tydesc-name.rs
index 4ba7e786ec8..1534c301c99 100644
--- a/src/test/run-pass/tydesc-name.rs
+++ b/src/test/run-pass/tydesc-name.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/type-id-higher-rank.rs b/src/test/run-pass/type-id-higher-rank.rs
index ec5aa2863a0..3030833c772 100644
--- a/src/test/run-pass/type-id-higher-rank.rs
+++ b/src/test/run-pass/type-id-higher-rank.rs
@@ -11,7 +11,6 @@
 // Test that type IDs correctly account for higher-rank lifetimes
 // Also acts as a regression test for an ICE (issue #19791)
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/type-namespace.rs b/src/test/run-pass/type-namespace.rs
index c03ddd0c649..36f8b2ca5b4 100644
--- a/src/test/run-pass/type-namespace.rs
+++ b/src/test/run-pass/type-namespace.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 struct A { a: isize }
 
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index 8c1251feea2..fc6499ce5d4 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::size_of;
 
diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs
index 2da8b0a508a..696e151a80e 100644
--- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs
+++ b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 enum T {
     A(isize),
diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/run-pass/typeck_type_placeholder_1.rs
index 53e78db68b1..113d52ffb35 100644
--- a/src/test/run-pass/typeck_type_placeholder_1.rs
+++ b/src/test/run-pass/typeck_type_placeholder_1.rs
@@ -11,7 +11,6 @@
 // This test checks that the `_` type placeholder works
 // correctly for enabling type inference.
 
-// pretty-expanded FIXME #23616
 
 struct TestStruct {
     x: *const isize
diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs
index 7a143ce5889..9741ed0fdde 100644
--- a/src/test/run-pass/typeid-intrinsic.rs
+++ b/src/test/run-pass/typeid-intrinsic.rs
@@ -11,7 +11,6 @@
 // aux-build:typeid-intrinsic.rs
 // aux-build:typeid-intrinsic2.rs
 
-// pretty-expanded FIXME #23616
 
 #![feature(hash, core)]
 
diff --git a/src/test/run-pass/typestate-multi-decl.rs b/src/test/run-pass/typestate-multi-decl.rs
index c7762a8464d..0749b52a1c6 100644
--- a/src/test/run-pass/typestate-multi-decl.rs
+++ b/src/test/run-pass/typestate-multi-decl.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let (x, y) = (10, 20);
diff --git a/src/test/run-pass/u32-decr.rs b/src/test/run-pass/u32-decr.rs
index 4955ac8a4be..b56b6f32c02 100644
--- a/src/test/run-pass/u32-decr.rs
+++ b/src/test/run-pass/u32-decr.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut word: u32 = 200000;
diff --git a/src/test/run-pass/u8-incr-decr.rs b/src/test/run-pass/u8-incr-decr.rs
index 7c67d304edb..d35ef015e6f 100644
--- a/src/test/run-pass/u8-incr-decr.rs
+++ b/src/test/run-pass/u8-incr-decr.rs
@@ -14,7 +14,6 @@
 
 // These constants were chosen because they aren't used anywhere
 // in the rest of the generated code so they're easily grep-able.
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut x: u8 = 19; // 0x13
diff --git a/src/test/run-pass/u8-incr.rs b/src/test/run-pass/u8-incr.rs
index e15576c3fab..9554f9c2dfb 100644
--- a/src/test/run-pass/u8-incr.rs
+++ b/src/test/run-pass/u8-incr.rs
@@ -11,7 +11,6 @@
 
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut x: u8 = 12;
diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/run-pass/ufcs-polymorphic-paths.rs
index a6ea0f76dc2..db3581976bb 100644
--- a/src/test/run-pass/ufcs-polymorphic-paths.rs
+++ b/src/test/run-pass/ufcs-polymorphic-paths.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections, rand, into_cow)]
 
diff --git a/src/test/run-pass/ufcs-trait-object.rs b/src/test/run-pass/ufcs-trait-object.rs
index b242018458d..457beeb3f37 100644
--- a/src/test/run-pass/ufcs-trait-object.rs
+++ b/src/test/run-pass/ufcs-trait-object.rs
@@ -11,7 +11,6 @@
 // Test that when you use ufcs form to invoke a trait method (on a
 // trait object) everything works fine.
 
-// pretty-expanded FIXME #23616
 
 trait Foo {
     fn test(&self) -> i32;
diff --git a/src/test/run-pass/unboxed-closures-all-traits.rs b/src/test/run-pass/unboxed-closures-all-traits.rs
index 9ca8e5403a1..c28d4f463e5 100644
--- a/src/test/run-pass/unboxed-closures-all-traits.rs
+++ b/src/test/run-pass/unboxed-closures-all-traits.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(lang_items, unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs b/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs
index 37dccca1e22..54c92900c89 100644
--- a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs
+++ b/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs
@@ -10,7 +10,6 @@
 
 // Test that you can supply `&F` where `F: FnMut()`.
 
-// pretty-expanded FIXME #23616
 
 #![feature(lang_items, unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-blanket-fn.rs b/src/test/run-pass/unboxed-closures-blanket-fn.rs
index 0f93966077b..eb474473094 100644
--- a/src/test/run-pass/unboxed-closures-blanket-fn.rs
+++ b/src/test/run-pass/unboxed-closures-blanket-fn.rs
@@ -10,7 +10,6 @@
 
 // Test that you can supply `&F` where `F: Fn()`.
 
-// pretty-expanded FIXME #23616
 
 #![feature(lang_items, unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-by-ref.rs b/src/test/run-pass/unboxed-closures-by-ref.rs
index 7855cf6ba0c..e3ddfdbac00 100644
--- a/src/test/run-pass/unboxed-closures-by-ref.rs
+++ b/src/test/run-pass/unboxed-closures-by-ref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs b/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs
index 6e92850ac2e..64236ce563b 100644
--- a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs
+++ b/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs
@@ -10,7 +10,6 @@
 
 // Test that the call operator autoderefs when calling a bounded type parameter.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs b/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs
index 402b4b0b85d..67ab84f0276 100644
--- a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs
+++ b/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs
@@ -10,7 +10,6 @@
 
 // Test that the call operator autoderefs when calling a bounded type parameter.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-counter-not-moved.rs b/src/test/run-pass/unboxed-closures-counter-not-moved.rs
index 792d1722776..cb5f190bcd7 100644
--- a/src/test/run-pass/unboxed-closures-counter-not-moved.rs
+++ b/src/test/run-pass/unboxed-closures-counter-not-moved.rs
@@ -10,7 +10,6 @@
 
 // Test that we mutate a counter on the stack only when we expect to.
 
-// pretty-expanded FIXME #23616
 
 fn call<F>(f: F) where F : FnOnce() {
     f();
diff --git a/src/test/run-pass/unboxed-closures-cross-crate.rs b/src/test/run-pass/unboxed-closures-cross-crate.rs
index 0c255c6bd6c..37dc760cedc 100644
--- a/src/test/run-pass/unboxed-closures-cross-crate.rs
+++ b/src/test/run-pass/unboxed-closures-cross-crate.rs
@@ -12,7 +12,6 @@
 // Acts as a regression test for #16790, #18378 and #18543
 
 // aux-build:unboxed-closures-cross-crate.rs
-// pretty-expanded FIXME #23616
 
 extern crate unboxed_closures_cross_crate as ubcc;
 
diff --git a/src/test/run-pass/unboxed-closures-drop.rs b/src/test/run-pass/unboxed-closures-drop.rs
index f0c6c0ff453..78f4905aef9 100644
--- a/src/test/run-pass/unboxed-closures-drop.rs
+++ b/src/test/run-pass/unboxed-closures-drop.rs
@@ -11,7 +11,6 @@
 // A battery of tests to ensure destructors of unboxed closure environments
 // run at the right times.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs b/src/test/run-pass/unboxed-closures-extern-fn-hr.rs
index 4af4b320d0e..e71757abd0e 100644
--- a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs
+++ b/src/test/run-pass/unboxed-closures-extern-fn-hr.rs
@@ -10,7 +10,6 @@
 
 // Checks that higher-ranked extern fn pointers implement the full range of Fn traits.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/unboxed-closures-extern-fn.rs b/src/test/run-pass/unboxed-closures-extern-fn.rs
index d711ebbe4b8..57acbae4ce6 100644
--- a/src/test/run-pass/unboxed-closures-extern-fn.rs
+++ b/src/test/run-pass/unboxed-closures-extern-fn.rs
@@ -10,7 +10,6 @@
 
 // Checks that extern fn pointers implement the full range of Fn traits.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 #![feature(unboxed_closures)]
diff --git a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs
index 9b71abf3653..5d6d372ea5c 100644
--- a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs
+++ b/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs
@@ -11,7 +11,6 @@
 // Checks that the Fn trait hierarchy rules permit
 // any Fn trait to be used where Fn is implemented.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs b/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs
index 6261058b867..c19b5b273c7 100644
--- a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs
+++ b/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs
@@ -11,7 +11,6 @@
 // Checks that the Fn trait hierarchy rules permit
 // FnMut or FnOnce to be used where FnMut is implemented.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs b/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs
index 798959f69d6..2da899ed95b 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs
+++ b/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs
@@ -11,7 +11,6 @@
 // Test that we are able to infer a suitable kind for this closure
 // that is just called (`FnMut`).
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let mut counter = 0;
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs b/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs
index 5b1e35a3e5c..32fc3433e84 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs
+++ b/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs
@@ -11,7 +11,6 @@
 // Test that we are able to infer a suitable kind for this `move`
 // closure that is just called (`FnMut`).
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let mut counter = 0;
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut.rs b/src/test/run-pass/unboxed-closures-infer-fnmut.rs
index cd7f26bba26..a8469f4019a 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut.rs
+++ b/src/test/run-pass/unboxed-closures-infer-fnmut.rs
@@ -11,7 +11,6 @@
 // Test that we are able to infer a suitable kind for this closure
 // that is just called (`FnMut`).
 
-// pretty-expanded FIXME #23616
 
 fn main() {
     let mut counter = 0;
diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs b/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs
index dc106614b53..dcda724c7b8 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs
+++ b/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce.rs b/src/test/run-pass/unboxed-closures-infer-fnonce.rs
index 036b32a44d2..275ba0520c5 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnonce.rs
+++ b/src/test/run-pass/unboxed-closures-infer-fnonce.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/unboxed-closures-infer-kind.rs b/src/test/run-pass/unboxed-closures-infer-kind.rs
index edc01d91f58..fa668475f58 100644
--- a/src/test/run-pass/unboxed-closures-infer-kind.rs
+++ b/src/test/run-pass/unboxed-closures-infer-kind.rs
@@ -11,7 +11,6 @@
 // Test that we can infer the "kind" of an unboxed closure based on
 // the expected type.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs b/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs
index e02784f917a..e499ab5cca0 100644
--- a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs
+++ b/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(core,unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-infer-upvar.rs b/src/test/run-pass/unboxed-closures-infer-upvar.rs
index e29632b007b..f2423145b19 100644
--- a/src/test/run-pass/unboxed-closures-infer-upvar.rs
+++ b/src/test/run-pass/unboxed-closures-infer-upvar.rs
@@ -11,7 +11,6 @@
 // Test that the type variable in the type(`Vec<_>`) of a closed over
 // variable does not interfere with type inference.
 
-// pretty-expanded FIXME #23616
 
 fn f<F: FnMut()>(mut f: F) {
     f();
diff --git a/src/test/run-pass/unboxed-closures-manual-impl.rs b/src/test/run-pass/unboxed-closures-manual-impl.rs
index 38f15d6e449..6a76fdb5ad7 100644
--- a/src/test/run-pass/unboxed-closures-manual-impl.rs
+++ b/src/test/run-pass/unboxed-closures-manual-impl.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures, core)]
 
diff --git a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
index b69153b73a3..e2b286738e7 100644
--- a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
+++ b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
@@ -11,7 +11,6 @@
 // Test that in a by-ref once closure we move some variables even as
 // we capture others by mutable reference.
 
-// pretty-expanded FIXME #23616
 
 fn call<F>(f: F) where F : FnOnce() {
     f();
diff --git a/src/test/run-pass/unboxed-closures-simple.rs b/src/test/run-pass/unboxed-closures-simple.rs
index 1443d305bce..ec341981669 100644
--- a/src/test/run-pass/unboxed-closures-simple.rs
+++ b/src/test/run-pass/unboxed-closures-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-single-word-env.rs b/src/test/run-pass/unboxed-closures-single-word-env.rs
index 65a26d14e12..166054e88b7 100644
--- a/src/test/run-pass/unboxed-closures-single-word-env.rs
+++ b/src/test/run-pass/unboxed-closures-single-word-env.rs
@@ -11,7 +11,6 @@
 // Ensures that single-word environments work right in unboxed closures.
 // These take a different path in codegen.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unboxed-closures-sugar-object.rs b/src/test/run-pass/unboxed-closures-sugar-object.rs
index 77beeb13fb0..49b9b7f061e 100644
--- a/src/test/run-pass/unboxed-closures-sugar-object.rs
+++ b/src/test/run-pass/unboxed-closures-sugar-object.rs
@@ -10,7 +10,6 @@
 
 // Test unboxed closure sugar used in object types.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
 #![feature(unboxed_closures)]
diff --git a/src/test/run-pass/unboxed-closures-unique-type-id.rs b/src/test/run-pass/unboxed-closures-unique-type-id.rs
index 403b2ca9aaf..de7eeb57de1 100644
--- a/src/test/run-pass/unboxed-closures-unique-type-id.rs
+++ b/src/test/run-pass/unboxed-closures-unique-type-id.rs
@@ -19,7 +19,6 @@
 //
 // compile-flags: -g
 
-// pretty-expanded FIXME #23616
 
 #![feature(unboxed_closures)]
 
diff --git a/src/test/run-pass/unfold-cross-crate.rs b/src/test/run-pass/unfold-cross-crate.rs
index fceccb499c7..5c699bf3044 100644
--- a/src/test/run-pass/unfold-cross-crate.rs
+++ b/src/test/run-pass/unfold-cross-crate.rs
@@ -10,7 +10,6 @@
 
 // no-pretty-expanded FIXME #15189
 
-// pretty-expanded FIXME #23616
 
 #![feature(core)]
 
diff --git a/src/test/run-pass/uniq-self-in-mut-slot.rs b/src/test/run-pass/uniq-self-in-mut-slot.rs
index a6408128c3a..baca157a488 100644
--- a/src/test/run-pass/uniq-self-in-mut-slot.rs
+++ b/src/test/run-pass/uniq-self-in-mut-slot.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-assign-copy.rs b/src/test/run-pass/unique-assign-copy.rs
index 32a0713ca93..3323b3c046b 100644
--- a/src/test/run-pass/unique-assign-copy.rs
+++ b/src/test/run-pass/unique-assign-copy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-assign-drop.rs b/src/test/run-pass/unique-assign-drop.rs
index 715fa548a7d..37aa1f0a64b 100644
--- a/src/test/run-pass/unique-assign-drop.rs
+++ b/src/test/run-pass/unique-assign-drop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
 #![allow(unknown_features)]
diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/run-pass/unique-assign-generic.rs
index ca145479a38..249b734a691 100644
--- a/src/test/run-pass/unique-assign-generic.rs
+++ b/src/test/run-pass/unique-assign-generic.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-assign.rs b/src/test/run-pass/unique-assign.rs
index e4e7b69671b..8e97fdd4a6a 100644
--- a/src/test/run-pass/unique-assign.rs
+++ b/src/test/run-pass/unique-assign.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-autoderef-field.rs b/src/test/run-pass/unique-autoderef-field.rs
index 8ee1b28ea2e..a711dbb685f 100644
--- a/src/test/run-pass/unique-autoderef-field.rs
+++ b/src/test/run-pass/unique-autoderef-field.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/run-pass/unique-autoderef-index.rs
index 9dc98cf2e3c..c68ff1f0612 100644
--- a/src/test/run-pass/unique-autoderef-index.rs
+++ b/src/test/run-pass/unique-autoderef-index.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-cmp.rs b/src/test/run-pass/unique-cmp.rs
index be7e46c8699..3b0ad63aeff 100644
--- a/src/test/run-pass/unique-cmp.rs
+++ b/src/test/run-pass/unique-cmp.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-decl-init-copy.rs b/src/test/run-pass/unique-decl-init-copy.rs
index 0840f1308cc..9d749803ffb 100644
--- a/src/test/run-pass/unique-decl-init-copy.rs
+++ b/src/test/run-pass/unique-decl-init-copy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-decl-init.rs b/src/test/run-pass/unique-decl-init.rs
index 1d5a44f45ab..a00de08998f 100644
--- a/src/test/run-pass/unique-decl-init.rs
+++ b/src/test/run-pass/unique-decl-init.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-decl-move.rs b/src/test/run-pass/unique-decl-move.rs
index 203a30e76bc..f4ff44ffff5 100644
--- a/src/test/run-pass/unique-decl-move.rs
+++ b/src/test/run-pass/unique-decl-move.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-decl.rs b/src/test/run-pass/unique-decl.rs
index 7404e8887eb..bbf9b2f47a7 100644
--- a/src/test/run-pass/unique-decl.rs
+++ b/src/test/run-pass/unique-decl.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let _: Box<isize>;
diff --git a/src/test/run-pass/unique-deref.rs b/src/test/run-pass/unique-deref.rs
index 44681742a70..70b2617797d 100644
--- a/src/test/run-pass/unique-deref.rs
+++ b/src/test/run-pass/unique-deref.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-destructure.rs b/src/test/run-pass/unique-destructure.rs
index 87bc6f6639d..b368cbee2f6 100644
--- a/src/test/run-pass/unique-destructure.rs
+++ b/src/test/run-pass/unique-destructure.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/unique-fn-arg-move.rs b/src/test/run-pass/unique-fn-arg-move.rs
index e608ab9b636..d101cbd3129 100644
--- a/src/test/run-pass/unique-fn-arg-move.rs
+++ b/src/test/run-pass/unique-fn-arg-move.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-fn-arg-mut.rs b/src/test/run-pass/unique-fn-arg-mut.rs
index f0d2abfe27c..ebe89b275d4 100644
--- a/src/test/run-pass/unique-fn-arg-mut.rs
+++ b/src/test/run-pass/unique-fn-arg-mut.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-fn-arg.rs b/src/test/run-pass/unique-fn-arg.rs
index 3d7ef31d020..97006d2a01a 100644
--- a/src/test/run-pass/unique-fn-arg.rs
+++ b/src/test/run-pass/unique-fn-arg.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-fn-ret.rs b/src/test/run-pass/unique-fn-ret.rs
index bb1948bf3c8..d3be0cf01f1 100644
--- a/src/test/run-pass/unique-fn-ret.rs
+++ b/src/test/run-pass/unique-fn-ret.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/run-pass/unique-in-vec-copy.rs
index 129c0784cca..ab0e3ee809d 100644
--- a/src/test/run-pass/unique-in-vec-copy.rs
+++ b/src/test/run-pass/unique-in-vec-copy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/run-pass/unique-in-vec.rs
index dc94fa6ca4f..41945821587 100644
--- a/src/test/run-pass/unique-in-vec.rs
+++ b/src/test/run-pass/unique-in-vec.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/run-pass/unique-kinds.rs
index 96d54193ac8..b808ac2b008 100644
--- a/src/test/run-pass/unique-kinds.rs
+++ b/src/test/run-pass/unique-kinds.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-move-drop.rs b/src/test/run-pass/unique-move-drop.rs
index e81095d548e..530ba478910 100644
--- a/src/test/run-pass/unique-move-drop.rs
+++ b/src/test/run-pass/unique-move-drop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unused_variable)]
 #![allow(unknown_features)]
diff --git a/src/test/run-pass/unique-move-temp.rs b/src/test/run-pass/unique-move-temp.rs
index 634a1569acf..4b937625201 100644
--- a/src/test/run-pass/unique-move-temp.rs
+++ b/src/test/run-pass/unique-move-temp.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-move.rs b/src/test/run-pass/unique-move.rs
index 29bf1139265..bed1d6e171a 100644
--- a/src/test/run-pass/unique-move.rs
+++ b/src/test/run-pass/unique-move.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-mutable.rs b/src/test/run-pass/unique-mutable.rs
index 106481e3189..8beec6a4198 100644
--- a/src/test/run-pass/unique-mutable.rs
+++ b/src/test/run-pass/unique-mutable.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-pat-2.rs b/src/test/run-pass/unique-pat-2.rs
index d16355af99f..c314b70e536 100644
--- a/src/test/run-pass/unique-pat-2.rs
+++ b/src/test/run-pass/unique-pat-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/unique-pat.rs b/src/test/run-pass/unique-pat.rs
index ae76179b5ec..1312ea924b5 100644
--- a/src/test/run-pass/unique-pat.rs
+++ b/src/test/run-pass/unique-pat.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_patterns)]
diff --git a/src/test/run-pass/unique-rec.rs b/src/test/run-pass/unique-rec.rs
index 7a09e241ca6..72975c27eea 100644
--- a/src/test/run-pass/unique-rec.rs
+++ b/src/test/run-pass/unique-rec.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/run-pass/unique-send-2.rs
index 99a3b641053..d80d0e82f4f 100644
--- a/src/test/run-pass/unique-send-2.rs
+++ b/src/test/run-pass/unique-send-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-send.rs b/src/test/run-pass/unique-send.rs
index c9649ef60d3..bc0f790b2b0 100644
--- a/src/test/run-pass/unique-send.rs
+++ b/src/test/run-pass/unique-send.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unique-swap.rs b/src/test/run-pass/unique-swap.rs
index 454011a9ec3..cfa076f1a07 100644
--- a/src/test/run-pass/unique-swap.rs
+++ b/src/test/run-pass/unique-swap.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unit-like-struct-drop-run.rs b/src/test/run-pass/unit-like-struct-drop-run.rs
index c2db63ed251..e31d4c811fc 100644
--- a/src/test/run-pass/unit-like-struct-drop-run.rs
+++ b/src/test/run-pass/unit-like-struct-drop-run.rs
@@ -10,7 +10,6 @@
 
 // Make sure the destructor is run for unit-like structs.
 
-// pretty-expanded FIXME #23616
 
 #![feature(alloc)]
 
diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs
index 612beabb035..c1c069236c8 100644
--- a/src/test/run-pass/unreachable-code-1.rs
+++ b/src/test/run-pass/unreachable-code-1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unreachable_code)]
 #![allow(unused_variable)]
diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs
index 4f58df66256..e19fda5f872 100644
--- a/src/test/run-pass/unreachable-code.rs
+++ b/src/test/run-pass/unreachable-code.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(path_statement)]
 #![allow(unreachable_code)]
diff --git a/src/test/run-pass/unsafe-coercion.rs b/src/test/run-pass/unsafe-coercion.rs
index d0c633e8278..8661ebb414c 100644
--- a/src/test/run-pass/unsafe-coercion.rs
+++ b/src/test/run-pass/unsafe-coercion.rs
@@ -10,7 +10,6 @@
 
 // Check that safe fns are not a subtype of unsafe fns.
 
-// pretty-expanded FIXME #23616
 
 fn foo(x: i32) -> i32 {
     x * 22
diff --git a/src/test/run-pass/unsafe-pointer-assignability.rs b/src/test/run-pass/unsafe-pointer-assignability.rs
index 75c7cabfcb6..c8ee0f83b9b 100644
--- a/src/test/run-pass/unsafe-pointer-assignability.rs
+++ b/src/test/run-pass/unsafe-pointer-assignability.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn f(x: *const isize) {
     unsafe {
diff --git a/src/test/run-pass/unsized3.rs b/src/test/run-pass/unsized3.rs
index 8db294bdcc1..2977f579fc5 100644
--- a/src/test/run-pass/unsized3.rs
+++ b/src/test/run-pass/unsized3.rs
@@ -10,7 +10,6 @@
 
 // Test structs with always-unsized fields.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax, core)]
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs
index 1d6ce626c28..07bfc8062f9 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/run-pass/unwind-unique.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
index e21ea025d8f..af06fe38136 100644
--- a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
+++ b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
@@ -13,7 +13,6 @@
 // us from approximating the lifetimes of `field1` and `field2` to a
 // common intersection.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
 #![feature(core)]
diff --git a/src/test/run-pass/variance-vec-covariant.rs b/src/test/run-pass/variance-vec-covariant.rs
index 2f554c3c4f3..89927b7b55b 100644
--- a/src/test/run-pass/variance-vec-covariant.rs
+++ b/src/test/run-pass/variance-vec-covariant.rs
@@ -10,7 +10,6 @@
 
 // Test that vec is now covariant in its argument type.
 
-// pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
 #![feature(core)]
diff --git a/src/test/run-pass/vec-dst.rs b/src/test/run-pass/vec-dst.rs
index e88acb3838b..223907c01be 100644
--- a/src/test/run-pass/vec-dst.rs
+++ b/src/test/run-pass/vec-dst.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/run-pass/vec-fixed-length.rs
index 4dadf53c772..fbaba9b8a61 100644
--- a/src/test/run-pass/vec-fixed-length.rs
+++ b/src/test/run-pass/vec-fixed-length.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::mem::size_of;
 
diff --git a/src/test/run-pass/vec-growth.rs b/src/test/run-pass/vec-growth.rs
index d5e6a9c4245..e51d898e1d4 100644
--- a/src/test/run-pass/vec-growth.rs
+++ b/src/test/run-pass/vec-growth.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut v = vec!(1);
diff --git a/src/test/run-pass/vec-macro-repeat.rs b/src/test/run-pass/vec-macro-repeat.rs
index 2a83ccaba82..d178041b85e 100644
--- a/src/test/run-pass/vec-macro-repeat.rs
+++ b/src/test/run-pass/vec-macro-repeat.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert_eq!(vec![1; 3], vec![1, 1, 1]);
diff --git a/src/test/run-pass/vec-macro-rvalue-scope.rs b/src/test/run-pass/vec-macro-rvalue-scope.rs
index 5869558eaca..305755347d0 100644
--- a/src/test/run-pass/vec-macro-rvalue-scope.rs
+++ b/src/test/run-pass/vec-macro-rvalue-scope.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 fn one() -> i32 { 1 }
 
diff --git a/src/test/run-pass/vec-macro-with-trailing-comma.rs b/src/test/run-pass/vec-macro-with-trailing-comma.rs
index 3018a746b4a..35af249ef5f 100644
--- a/src/test/run-pass/vec-macro-with-trailing-comma.rs
+++ b/src/test/run-pass/vec-macro-with-trailing-comma.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert_eq!(vec!(1), vec!(1,));
diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/run-pass/vec-matching-autoslice.rs
index 2b80ad81037..5728424e32b 100644
--- a/src/test/run-pass/vec-matching-autoslice.rs
+++ b/src/test/run-pass/vec-matching-autoslice.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/vec-matching-fixed.rs b/src/test/run-pass/vec-matching-fixed.rs
index 1278eaf96a4..1ed6ddc4110 100644
--- a/src/test/run-pass/vec-matching-fixed.rs
+++ b/src/test/run-pass/vec-matching-fixed.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(advanced_slice_patterns)]
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/vec-matching-fold.rs b/src/test/run-pass/vec-matching-fold.rs
index c375fc85bc1..ee70ea58750 100644
--- a/src/test/run-pass/vec-matching-fold.rs
+++ b/src/test/run-pass/vec-matching-fold.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(advanced_slice_patterns)]
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/vec-matching.rs b/src/test/run-pass/vec-matching.rs
index b81bdda613f..eedf27f8577 100644
--- a/src/test/run-pass/vec-matching.rs
+++ b/src/test/run-pass/vec-matching.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(advanced_slice_patterns)]
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/run-pass/vec-slice-drop.rs
index 1d749d4963c..f400869682f 100644
--- a/src/test/run-pass/vec-slice-drop.rs
+++ b/src/test/run-pass/vec-slice-drop.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_destructor)]
 
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs
index 6baeb99df9e..a7e6cae93b3 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/run-pass/vec-slice.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let  v = vec![1,2,3,4,5];
diff --git a/src/test/run-pass/vec-tail-matching.rs b/src/test/run-pass/vec-tail-matching.rs
index 091e3f03e7a..75f970543a4 100644
--- a/src/test/run-pass/vec-tail-matching.rs
+++ b/src/test/run-pass/vec-tail-matching.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
 
diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/run-pass/vec-to_str.rs
index a9bb68395c4..f000ada770a 100644
--- a/src/test/run-pass/vec-to_str.rs
+++ b/src/test/run-pass/vec-to_str.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     assert_eq!(format!("{:?}", vec!(0, 1)), "[0, 1]".to_string());
diff --git a/src/test/run-pass/vec.rs b/src/test/run-pass/vec.rs
index ce20d452c40..c61b3d56dbf 100644
--- a/src/test/run-pass/vec.rs
+++ b/src/test/run-pass/vec.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let v: Vec<isize> = vec!(10, 20);
diff --git a/src/test/run-pass/vector-sort-panic-safe.rs b/src/test/run-pass/vector-sort-panic-safe.rs
index eca7e62d67c..acb29d284b9 100644
--- a/src/test/run-pass/vector-sort-panic-safe.rs
+++ b/src/test/run-pass/vector-sort-panic-safe.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(rand, core)]
 
diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/run-pass/wait-forked-but-failed-child.rs
index 079c97013ab..998360f08ba 100644
--- a/src/test/run-pass/wait-forked-but-failed-child.rs
+++ b/src/test/run-pass/wait-forked-but-failed-child.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(libc, old_io)]
 
diff --git a/src/test/run-pass/where-for-self.rs b/src/test/run-pass/where-for-self.rs
index eb95b13d3fa..1d477b87446 100644
--- a/src/test/run-pass/where-for-self.rs
+++ b/src/test/run-pass/where-for-self.rs
@@ -11,7 +11,6 @@
 // Test that we can quantify lifetimes outside a constraint (i.e., including
 // the self type) in a where clause.
 
-// pretty-expanded FIXME #23616
 
 static mut COUNT: u32 = 1;
 
diff --git a/src/test/run-pass/while-label.rs b/src/test/run-pass/while-label.rs
index 076ba8f428f..8cbb845836f 100644
--- a/src/test/run-pass/while-label.rs
+++ b/src/test/run-pass/while-label.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 
-// pretty-expanded FIXME #23616
 
 pub fn main() {
     let mut i = 100;
diff --git a/src/test/run-pass/while-let.rs b/src/test/run-pass/while-let.rs
index b1e80c86ec7..5a2ecdd45db 100644
--- a/src/test/run-pass/while-let.rs
+++ b/src/test/run-pass/while-let.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(collections)]
 
diff --git a/src/test/run-pass/writealias.rs b/src/test/run-pass/writealias.rs
index 10718e981ff..7339fe47dc2 100644
--- a/src/test/run-pass/writealias.rs
+++ b/src/test/run-pass/writealias.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 use std::sync::Mutex;
 
diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/run-pass/xcrate-address-insignificant.rs
index ac8b15d7bf5..8794ecd061b 100644
--- a/src/test/run-pass/xcrate-address-insignificant.rs
+++ b/src/test/run-pass/xcrate-address-insignificant.rs
@@ -10,7 +10,6 @@
 
 // aux-build:xcrate_address_insignificant.rs
 
-// pretty-expanded FIXME #23616
 
 extern crate xcrate_address_insignificant as foo;
 
diff --git a/src/test/run-pass/zero-size-type-destructors.rs b/src/test/run-pass/zero-size-type-destructors.rs
index dea9edf0582..a80faeaea7e 100644
--- a/src/test/run-pass/zero-size-type-destructors.rs
+++ b/src/test/run-pass/zero-size-type-destructors.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(unsafe_no_drop_flag)]
 
diff --git a/src/test/run-pass/zero_sized_subslice_match.rs b/src/test/run-pass/zero_sized_subslice_match.rs
index b98f907774b..697508ae488 100644
--- a/src/test/run-pass/zero_sized_subslice_match.rs
+++ b/src/test/run-pass/zero_sized_subslice_match.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]