Skip to content

Commit d34318d

Browse files
borsbors
authored
Auto merge of #37118 - alexcrichton:rollup, r=alexcrichton
Rollup of 17 pull requests - Successful merges: #36762, #36831, #36973, #36991, #36995, #37023, #37049, #37050, #37056, #37064, #37066, #37067, #37084, #37089, #37091, #37092, #37110 - Failed merges:
2 parents 9cb0136 + 27043b1 commit d34318d

File tree

105 files changed

+1321
-945
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1321
-945
lines changed

‎configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -1635,8 +1635,8 @@ do
16351635
("ccache gcc")
16361636
LLVM_CXX_32="ccache"
16371637
LLVM_CC_32="ccache"
1638-
LLVM_CXX_32_ARG1="clang++"
1639-
LLVM_CC_32_ARG1="clang"
1638+
LLVM_CXX_32_ARG1="g++"
1639+
LLVM_CC_32_ARG1="gcc"
16401640

16411641
LLVM_CXX_64="ccache"
16421642
LLVM_CC_64="ccache"

‎src/doc/reference.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -2472,8 +2472,7 @@ The currently implemented features of the reference compiler are:
24722472
* - `default_type_parameter_fallback` - Allows type parameter defaults to
24732473
influence type inference.
24742474

2475-
* - `stmt_expr_attributes` - Allows attributes on expressions and
2476-
non-item statements.
2475+
* - `stmt_expr_attributes` - Allows attributes on expressions.
24772476

24782477
* - `type_ascription` - Allows type ascription expressions `expr: Type`.
24792478

‎src/libcore/any.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373

7474
use fmt;
7575
use intrinsics;
76-
use marker::Reflect;
7776

7877
///////////////////////////////////////////////////////////////////////////////
7978
// Any trait
@@ -86,7 +85,7 @@ use marker::Reflect;
8685
///
8786
/// [mod]: index.html
8887
#[stable(feature = "rust1", since = "1.0.0")]
89-
pub trait Any: Reflect + 'static {
88+
pub trait Any: 'static {
9089
/// Gets the `TypeId` of `self`.
9190
///
9291
/// # Examples
@@ -112,7 +111,7 @@ pub trait Any: Reflect + 'static {
112111
}
113112

114113
#[stable(feature = "rust1", since = "1.0.0")]
115-
impl<T: Reflect + 'static + ?Sized > Any for T {
114+
impl<T: 'static + ?Sized > Any for T {
116115
fn get_type_id(&self) -> TypeId { TypeId::of::<T>() }
117116
}
118117

@@ -366,7 +365,7 @@ impl TypeId {
366365
/// }
367366
/// ```
368367
#[stable(feature = "rust1", since = "1.0.0")]
369-
pub fn of<T: ?Sized + Reflect + 'static>() -> TypeId {
368+
pub fn of<T: ?Sized + 'static>() -> TypeId {
370369
TypeId {
371370
t: unsafe { intrinsics::type_id::<T>() },
372371
}

‎src/libcore/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
#![feature(specialization)]
9090
#![feature(staged_api)]
9191
#![feature(unboxed_closures)]
92-
#![feature(question_mark)]
92+
#![cfg_attr(stage0, feature(question_mark))]
9393
#![feature(never_type)]
9494
#![feature(prelude_import)]
9595

‎src/libcore/macros.rs

+3
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ macro_rules! debug_assert_ne {
255255
/// Helper macro for reducing boilerplate code for matching `Result` together
256256
/// with converting downstream errors.
257257
///
258+
/// Prefer using `?` syntax to `try!`. `?` is built in to the language and is
259+
/// more succinct than `try!`. It is the standard method for error propagation.
260+
///
258261
/// `try!` matches the given `Result`. In case of the `Ok` variant, the
259262
/// expression has the value of the wrapped value.
260263
///

‎src/libcore/marker.rs

+3
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,14 @@ mod impls {
587587
#[unstable(feature = "reflect_marker",
588588
reason = "requires RFC and more experience",
589589
issue = "27749")]
590+
#[rustc_deprecated(since = "1.14.0", reason = "Specialization makes parametricity impossible")]
590591
#[rustc_on_unimplemented = "`{Self}` does not implement `Any`; \
591592
ensure all type parameters are bounded by `Any`"]
592593
pub trait Reflect {}
593594

594595
#[unstable(feature = "reflect_marker",
595596
reason = "requires RFC and more experience",
596597
issue = "27749")]
598+
#[rustc_deprecated(since = "1.14.0", reason = "Specialization makes parametricity impossible")]
599+
#[allow(deprecated)]
597600
impl Reflect for .. { }

‎src/libgraphviz/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
#![cfg_attr(not(stage0), deny(warnings))]
296296

297297
#![feature(str_escape)]
298-
#![feature(question_mark)]
298+
#![cfg_attr(stage0, feature(question_mark))]
299299

300300
use self::LabelText::*;
301301

‎src/liblibc

‎src/librustc/diagnostics.rs

-24
Original file line numberDiff line numberDiff line change
@@ -1327,30 +1327,6 @@ let x: i32 = "I am not a number!";
13271327
// |
13281328
// type `i32` assigned to variable `x`
13291329
```
1330-
1331-
Another situation in which this occurs is when you attempt to use the `try!`
1332-
macro inside a function that does not return a `Result<T, E>`:
1333-
1334-
```compile_fail,E0308
1335-
use std::fs::File;
1336-
1337-
fn main() {
1338-
let mut f = try!(File::create("foo.txt"));
1339-
}
1340-
```
1341-
1342-
This code gives an error like this:
1343-
1344-
```text
1345-
<std macros>:5:8: 6:42 error: mismatched types:
1346-
expected `()`,
1347-
found `core::result::Result<_, _>`
1348-
(expected (),
1349-
found enum `core::result::Result`) [E0308]
1350-
```
1351-
1352-
`try!` returns a `Result<T, E>`, and so the function must. But `main()` has
1353-
`()` as its return type, hence the error.
13541330
"##,
13551331

13561332
E0309: r##"

‎src/librustc/hir/lowering.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,7 @@ pub fn lower_crate(sess: &Session,
9494
let _ignore = sess.dep_graph.in_ignore();
9595

9696
LoweringContext {
97-
crate_root: if std_inject::no_core(krate) {
98-
None
99-
} else if std_inject::no_std(krate) {
100-
Some("core")
101-
} else {
102-
Some("std")
103-
},
97+
crate_root: std_inject::injected_crate_name(krate),
10498
sess: sess,
10599
parent_def: None,
106100
resolver: resolver,

‎src/librustc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#![feature(rustc_private)]
4141
#![feature(slice_patterns)]
4242
#![feature(staged_api)]
43-
#![feature(question_mark)]
43+
#![cfg_attr(stage0, feature(question_mark))]
4444
#![cfg_attr(test, feature(test))]
4545

4646
extern crate arena;

‎src/librustc/session/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ pub struct PerfStats {
118118
pub incr_comp_hashes_time: Cell<Duration>,
119119
// The number of incr. comp. hash computations performed
120120
pub incr_comp_hashes_count: Cell<u64>,
121+
// The number of bytes hashed when computing ICH values
122+
pub incr_comp_bytes_hashed: Cell<u64>,
121123
// The accumulated time spent on computing symbol hashes
122124
pub symbol_hash_time: Cell<Duration>,
123125
}
@@ -439,6 +441,11 @@ impl Session {
439441
duration_to_secs_str(self.perf_stats.incr_comp_hashes_time.get()));
440442
println!("Total number of incr. comp. hashes computed: {}",
441443
self.perf_stats.incr_comp_hashes_count.get());
444+
println!("Total number of bytes hashed for incr. comp.: {}",
445+
self.perf_stats.incr_comp_bytes_hashed.get());
446+
println!("Average bytes hashed per incr. comp. HIR node: {}",
447+
self.perf_stats.incr_comp_bytes_hashed.get() /
448+
self.perf_stats.incr_comp_hashes_count.get());
442449
println!("Total time spent computing symbol hashes: {}",
443450
duration_to_secs_str(self.perf_stats.symbol_hash_time.get()));
444451
}
@@ -571,6 +578,7 @@ pub fn build_session_(sopts: config::Options,
571578
svh_time: Cell::new(Duration::from_secs(0)),
572579
incr_comp_hashes_time: Cell::new(Duration::from_secs(0)),
573580
incr_comp_hashes_count: Cell::new(0),
581+
incr_comp_bytes_hashed: Cell::new(0),
574582
symbol_hash_time: Cell::new(Duration::from_secs(0)),
575583
}
576584
};

‎src/librustc_back/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#![feature(rustc_private)]
3838
#![feature(staged_api)]
3939
#![feature(step_by)]
40-
#![feature(question_mark)]
40+
#![cfg_attr(stage0, feature(question_mark))]
4141
#![cfg_attr(test, feature(test, rand))]
4242

4343
extern crate syntax;

‎src/librustc_borrowck/borrowck/mir/dataflow/graphviz.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
1313
use syntax::ast::NodeId;
1414
use rustc::mir::repr::{BasicBlock, Mir};
15+
use rustc_data_structures::bitslice::bits_to_string;
16+
use rustc_data_structures::indexed_set::{IdxSet};
1517
use rustc_data_structures::indexed_vec::Idx;
1618

1719
use dot;
@@ -27,8 +29,6 @@ use std::path::Path;
2729

2830
use super::super::MoveDataParamEnv;
2931
use super::super::MirBorrowckCtxtPreDataflow;
30-
use bitslice::bits_to_string;
31-
use indexed_set::{IdxSet};
3232
use super::{BitDenotation, DataflowState};
3333

3434
impl<O: BitDenotation> DataflowState<O> {

‎src/librustc_borrowck/borrowck/mir/dataflow/impls.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
use rustc::ty::TyCtxt;
1212
use rustc::mir::repr::{self, Mir, Location};
13+
use rustc_data_structures::bitslice::BitSlice; // adds set_bit/get_bit to &[usize] bitvector rep.
14+
use rustc_data_structures::bitslice::{BitwiseOperator};
15+
use rustc_data_structures::indexed_set::{IdxSet};
1316
use rustc_data_structures::indexed_vec::Idx;
1417

1518
use super::super::gather_moves::{MoveOutIndex, MovePathIndex};
@@ -21,10 +24,6 @@ use super::super::on_lookup_result_bits;
2124

2225
use super::{BitDenotation, BlockSets, DataflowOperator};
2326

24-
use bitslice::BitSlice; // adds set_bit/get_bit to &[usize] bitvector rep.
25-
use bitslice::{BitwiseOperator};
26-
use indexed_set::{IdxSet};
27-
2827
// Dataflow analyses are built upon some interpretation of the
2928
// bitvectors attached to each basic block, represented via a
3029
// zero-sized structure.

‎src/librustc_borrowck/borrowck/mir/dataflow/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use rustc_data_structures::indexed_set::{IdxSet, IdxSetBuf};
1112
use rustc_data_structures::indexed_vec::Idx;
13+
use rustc_data_structures::bitslice::{bitwise, BitwiseOperator};
1214

1315
use rustc::ty::TyCtxt;
1416
use rustc::mir::repr::{self, Mir};
@@ -22,9 +24,6 @@ use std::usize;
2224
use super::MirBorrowckCtxtPreDataflow;
2325
use super::MoveDataParamEnv;
2426

25-
use bitslice::{bitwise, BitwiseOperator};
26-
use indexed_set::{IdxSet, IdxSetBuf};
27-
2827
pub use self::sanity_check::sanity_check_via_rustc_peek;
2928
pub use self::impls::{MaybeInitializedLvals, MaybeUninitializedLvals};
3029
pub use self::impls::{DefinitelyInitializedLvals, MovingOutStatements};

‎src/librustc_borrowck/borrowck/mir/elaborate_drops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use indexed_set::IdxSetBuf;
1211
use super::gather_moves::{MoveData, MovePathIndex, LookupResult};
1312
use super::dataflow::{MaybeInitializedLvals, MaybeUninitializedLvals};
1413
use super::dataflow::{DataflowResults};
@@ -23,6 +22,7 @@ use rustc::mir::transform::{Pass, MirPass, MirSource};
2322
use rustc::middle::const_val::ConstVal;
2423
use rustc::middle::lang_items;
2524
use rustc::util::nodemap::FnvHashMap;
25+
use rustc_data_structures::indexed_set::IdxSetBuf;
2626
use rustc_data_structures::indexed_vec::Idx;
2727
use syntax_pos::Span;
2828

‎src/librustc_borrowck/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#![feature(staged_api)]
2727
#![feature(associated_consts)]
2828
#![feature(nonzero)]
29-
#![feature(question_mark)]
29+
#![cfg_attr(stage0, feature(question_mark))]
3030
#[macro_use] extern crate log;
3131
#[macro_use] extern crate syntax;
3232
extern crate syntax_pos;
@@ -50,8 +50,6 @@ pub use borrowck::{AnalysisData, BorrowckCtxt, ElaborateDrops};
5050
pub mod diagnostics;
5151

5252
mod borrowck;
53-
mod bitslice;
54-
mod indexed_set;
5553

5654
pub mod graphviz;
5755

‎src/librustc_const_eval/eval.rs

+4
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,10 @@ pub fn eval_const_expr_partial<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
732732
hir::BiBitOr => a | b,
733733
hir::BiEq => a == b,
734734
hir::BiNe => a != b,
735+
hir::BiLt => a < b,
736+
hir::BiLe => a <= b,
737+
hir::BiGe => a >= b,
738+
hir::BiGt => a > b,
735739
_ => signal!(e, InvalidOpForBools(op.node)),
736740
})
737741
}

‎src/librustc_const_eval/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#![feature(staged_api)]
2828
#![feature(rustc_diagnostic_macros)]
2929
#![feature(slice_patterns)]
30-
#![feature(question_mark)]
30+
#![cfg_attr(stage0, feature(question_mark))]
3131
#![feature(box_patterns)]
3232
#![feature(box_syntax)]
3333

‎src/librustc_const_math/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#![feature(rustc_private)]
2727
#![feature(staged_api)]
28-
#![feature(question_mark)]
28+
#![cfg_attr(stage0, feature(question_mark))]
2929

3030
#[macro_use] extern crate log;
3131
#[macro_use] extern crate syntax;

‎src/librustc_borrowck/bitslice.rs ‎src/librustc_data_structures/bitslice.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// FIXME: move this to `rustc_data_structures` and potentially merge
12-
// with `bitvec` there.
11+
// FIXME: merge with `bitvec`
1312

1413
use std::mem;
1514

‎src/librustc_borrowck/indexed_set.rs ‎src/librustc_data_structures/indexed_set.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// FIXME: move this to `rustc_data_structures`
12-
1311
use std::fmt;
1412
use std::marker::PhantomData;
1513
use std::mem;
1614
use std::ops::{Deref, DerefMut, Range};
1715
use bitslice::{BitSlice, Word};
1816
use bitslice::{bitwise, Union, Subtract};
19-
20-
use rustc_data_structures::indexed_vec::Idx;
17+
use indexed_vec::Idx;
2118

2219
/// Represents a set (or packed family of sets), of some element type
2320
/// E, where each E is identified by some unique index type `T`.

‎src/librustc_data_structures/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ extern crate serialize as rustc_serialize; // used by deriving
4141
#[cfg(unix)]
4242
extern crate libc;
4343

44+
pub mod bitslice;
4445
pub mod bitvec;
4546
pub mod graph;
4647
pub mod ivar;
48+
pub mod indexed_set;
4749
pub mod indexed_vec;
4850
pub mod obligation_forest;
4951
pub mod snapshot_map;

‎src/librustc_driver/driver.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ pub fn phase_2_configure_and_expand<'a, F>(sess: &Session,
649649
let resolver_arenas = Resolver::arenas();
650650
let mut resolver =
651651
Resolver::new(sess, &krate, make_glob_map, &mut crate_loader, &resolver_arenas);
652-
syntax_ext::register_builtins(&mut resolver, sess.features.borrow().quote);
652+
syntax_ext::register_builtins(&mut resolver, syntax_exts, sess.features.borrow().quote);
653653

654654
krate = time(time_passes, "expansion", || {
655655
// Windows dlls do not have rpaths, so they don't know how to find their
@@ -686,11 +686,17 @@ pub fn phase_2_configure_and_expand<'a, F>(sess: &Session,
686686
..syntax::ext::expand::ExpansionConfig::default(crate_name.to_string())
687687
};
688688
let mut ecx = ExtCtxt::new(&sess.parse_sess, krate.config.clone(), cfg, &mut resolver);
689-
let ret = syntax::ext::expand::expand_crate(&mut ecx, syntax_exts, krate);
689+
let err_count = ecx.parse_sess.span_diagnostic.err_count();
690+
691+
let krate = ecx.monotonic_expander().expand_crate(krate);
692+
693+
if ecx.parse_sess.span_diagnostic.err_count() - ecx.resolve_err_count > err_count {
694+
ecx.parse_sess.span_diagnostic.abort_if_errors();
695+
}
690696
if cfg!(windows) {
691697
env::set_var("PATH", &old_path);
692698
}
693-
ret
699+
krate
694700
});
695701

696702
krate.exported_macros = mem::replace(&mut resolver.exported_macros, Vec::new());

0 commit comments

Comments
 (0)