Niko Matsakis c2dba8580a Merge conflicts

2015-04-02 13:25:06 -04:00

..

ambig_impl_2_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

anon_trait_static_method_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

anon-extern-mod-cross-crate-1.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

associated-types-cc-lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

blind-item-mixed-crate-use-item-foo2.rs

…

blind-item-mixed-crate-use-item-foo.rs

…

cci_borrow_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_capture_clause.rs

rollup merge of #22319: huonw/send-is-not-static

2015-02-17 17:32:16 -08:00

cci_class_2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_3.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_4.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_5.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_6.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_cast.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_class_trait.rs

…

cci_class.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_const_block.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_const.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_impl_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_intrinsic.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_iter_lib.rs

Remove integer suffixes where the types in compiled code are identical.

2015-03-05 12:38:33 +05:30

cci_nested_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cci_no_inline_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cfg_inner_static.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

changing-crates-a1.rs

…

changing-crates-a2.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

changing-crates-b.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

check_static_recursion_foreign_helper.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

coherence_copy_like_lib.rs

Merge conflicts

2015-04-02 13:25:06 -04:00

coherence_inherent_cc_lib.rs

…

coherence_lib.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

coherence_orphan_lib.rs

Fallout in tests

2015-04-02 13:24:46 -04:00

crate_with_invalid_spans_macros.rs

Add test case for stable import of invalid span information.

2015-03-19 18:52:30 +01:00

crate_with_invalid_spans.rs

Add test case for stable import of invalid span information.

2015-03-19 18:52:30 +01:00

crate-method-reexport-grrrrrrr2.rs

…

crateresolve1-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve1-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve1-3.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve3-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve3-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve4a-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve4a-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve4b-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve4b-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve5-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve5-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve7x.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve8-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve_calories-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

crateresolve_calories-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

cross_crate_debuginfo_type_uniquing.rs

…

cross_crate_spans.rs

Stabilize std::path

2015-03-12 16:38:58 -07:00

custom_derive_plugin.rs

Make #[derive(Anything)] into sugar for #[derive_Anything]

2015-03-06 18:20:16 -08:00

default_type_params_xc.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

explicit_self_xcrate.rs

…

extern_calling_convention.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

extern_mod_ordering_lib.rs

…

extern-crosscrate-source.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

foreign_lib.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

go_trait.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

i8.rs

…

impl_privacy_xc_1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

impl_privacy_xc_2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

inherit_struct_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

inherited_stability.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

inline_dtor.rs

…

inner_static.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

internal_unstable.rs

Add #[allow_internal_unstable] to track stability for macros better.

2015-03-06 00:18:28 +11:00

iss.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

issue2170lib.rs

…

issue13213aux.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

issue13507.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_2242_a.rs

…

issue_2242_c.rs

…

issue_2316_a.rs

…

issue_2316_b.rs

…

issue_2472_b.rs

…

issue_2723_a.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_3136_a.rc

…

issue_3136_a.rs

…

issue_3907_1.rs

…

issue_3907.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

issue_3979_traits.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_5844_aux.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

issue_8401.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

issue_9123.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

issue_9155.rs

…

issue_9188.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_10031_aux.rs

…

issue_11680.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_12612_1.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

issue_12612_2.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

issue_16723_multiple_items_syntax_ext.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

issue_16725.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

issue_17718_const_privacy.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_19293.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue_20389.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

issue_21202.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

issue-2380.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

issue-2414-a.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-2414-b.rs

…

issue-2526.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-2631-a.rs

Fallout in stdlib, rustdoc, rustc, etc. For most maps, converted uses of

2015-03-23 16:55:45 -04:00

issue-3012-1.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

issue-4208-cc.rs

…

issue-4545.rs

…

issue-5518.rs

…

issue-5521.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-7178.rs

…

issue-7899.rs

…

issue-8044.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-8259.rs

…

issue-9906.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-9968.rs

…

issue-10028.rs

…

issue-11224.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-11225-1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-11225-2.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-11508.rs

…

issue-11529.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-12133-dylib2.rs

Fix fallout of removing quotes in crate names

2015-03-27 11:43:40 -07:00

issue-12133-dylib.rs

…

issue-12133-rlib.rs

…

issue-12660-aux.rs

…

issue-13560-1.rs

…

issue-13560-2.rs

…

issue-13560-3.rs

Fix fallout of removing quotes in crate names

2015-03-27 11:43:40 -07:00

issue-13620-1.rs

…

issue-13620-2.rs

Fix fallout of removing quotes in crate names

2015-03-27 11:43:40 -07:00

issue-13872-1.rs

…

issue-13872-2.rs

Fix fallout of removing quotes in crate names

2015-03-27 11:43:40 -07:00

issue-13872-3.rs

Fix fallout of removing quotes in crate names

2015-03-27 11:43:40 -07:00

issue-14421.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

issue-14422.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

issue-15562.rs

…

issue-16643.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

issue-16822.rs

…

issue-17662.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

issue-17718.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

issue-18501.rs

…

issue-18502.rs

…

issue-18514.rs

…

issue-18711.rs

…

issue-19340-1.rs

…

issue-21146-inc.rs

…

kinds_in_metadata.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

lang-item-public.rs

Fallout in tests

2015-04-02 13:24:46 -04:00

linkage1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

linkage-visibility.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

lint_for_crate.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

lint_group_plugin_test.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

lint_output_format.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

lint_plugin_test.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

lint_stability_fields.rs

Check stability of struct fields.

2015-02-26 16:26:34 +11:00

lint_stability.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

lint_unused_extern_crate.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

logging_right_crate.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

macro_crate_def_only.rs

…

macro_crate_MacroRulesTT.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

macro_crate_nonterminal.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

macro_crate_test.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

macro_export_inner_module.rs

…

macro_non_reexport_2.rs

…

macro_reexport_1.rs

Remove integer suffixes where the types in compiled code are identical.

2015-03-05 12:38:33 +05:30

macro_reexport_2_no_use.rs

…

macro_reexport_2.rs

…

macro_with_super_1.rs

…

macro-include-items-expr.rs

…

macro-include-items-item.rs

…

method_self_arg1.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

method_self_arg2.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

moves_based_on_type_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

namespaced_enum_emulate_flat.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

namespaced_enums.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

nested_item.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

newtype_struct_xc.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

no_method_suggested_traits.rs

…

no_std_crate.rs

…

noexporttypelib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

orphan_check_diagnostics.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

overloaded_autoderef_xc.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

packed.rs

…

plugin_args.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

plugin_crate_outlive_expansion_phase.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

plugin_with_plugin_lib.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

priv-impl-prim-ty.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

privacy_reexport.rs

Fallout in testing.

2015-03-16 11:03:54 +13:00

privacy_tuple_struct.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

private_trait_xc.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

procedural_mbe_matching.rs

rollup merge of #23598: brson/gate

2015-03-23 15:13:15 -07:00

pub_static_array.rs

Regression test for #13077

2015-03-16 07:35:24 -07:00

pub_use_mods_xcrate.rs

…

pub_use_xcrate1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

pub_use_xcrate2.rs

…

reexport-should-still-link.rs

…

reexported_static_methods.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

regions_bounded_method_type_parameters_cross_crate_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

rlib_crate_test.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

roman_numerals.rs

rollup merge of #23794: brson/slicegate

2015-03-27 16:09:52 -07:00

sepcomp_cci_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

sepcomp_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

sepcomp-extern-lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

stability_cfg1.rs

…

stability_cfg2.rs

…

static_fn_inline_xc_aux.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

static_fn_trait_xc_aux.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

static_mut_xc.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

static_priv_by_default.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

static-function-pointer-aux.rs

rollup merge of #23786: alexcrichton/less-quotes

2015-03-27 16:10:25 -07:00

static-methods-crate.rs

Test fixes and rebase conflicts

2015-02-27 15:13:35 -08:00

struct_destructuring_cross_crate.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

struct_field_privacy.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

struct_variant_privacy.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

struct_variant_xc_aux.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

svh-a-base.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-lit.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-significant-cfg.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-trait-bound.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-type-arg.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-type-ret.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-change-type-static.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-comment.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-doc.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-macro.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-no-change.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-redundant-cfg.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-a-whitespace.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-b.rs

…

svh-uta-base.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-uta-change-use-trait.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

svh-utb.rs

…

syntax_extension_with_dll_deps_1.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

syntax_extension_with_dll_deps_2.rs

Unquote all crate names without underscores

2015-03-27 10:58:12 -07:00

trait_bounds_on_structs_and_enums_xc.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_default_method_xc_aux_2.rs

rollup merge of #23786: alexcrichton/less-quotes

2015-03-27 16:10:25 -07:00

trait_default_method_xc_aux.rs

rollup merge of #23786: alexcrichton/less-quotes

2015-03-27 16:10:25 -07:00

trait_impl_conflict.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_inheritance_auto_xc_2_aux.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_inheritance_auto_xc_aux.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_inheritance_cross_trait_call_xc_aux.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_inheritance_overloading_xc.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_safety_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

trait_superkinds_in_metadata.rs

…

traitimpl.rs

…

two_macros.rs

…

typeck_default_trait_impl_cross_crate_coherence_lib.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

typeid-intrinsic2.rs

rollup merge of #23741: alexcrichton/remove-int-uint

2015-03-27 10:10:05 -07:00

typeid-intrinsic.rs

rollup merge of #23741: alexcrichton/remove-int-uint

2015-03-27 10:10:05 -07:00

unboxed-closures-cross-crate.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

unreachable_variant.rs

rustc: Add support for extern crate foo as bar

2015-03-24 14:55:15 -07:00

use_from_trait_xc.rs

Fallout: tests. As tests frequently elide things, lots of changes

2015-02-18 10:25:28 -05:00

weak-lang-items.rs

Require feature attributes, and add them where necessary

2015-03-23 14:40:26 -07:00

where_clauses_xc.rs

Strip all leading/trailing newlines

2015-03-15 09:08:21 -07:00

xc_private_method_lib.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

xcrate_address_insignificant.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

xcrate_static_addresses.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

xcrate_struct_aliases.rs

Mass rename uint/int to usize/isize

2015-03-26 12:10:22 -07:00

xcrate_unit_struct.rs

Fallout in tests

2015-04-01 11:22:39 -04:00

xcrate-trait-lifetime-param.rs

…