Skip to content

Commit 699c6de

Browse files
committed
---
yaml --- r: 196251 b: refs/heads/tmp c: 35c261a h: refs/heads/master i: 196249: dbfe154 196247: 29724e2 v: v3
1 parent e6e247f commit 699c6de

File tree

6 files changed

+10
-1
lines changed

6 files changed

+10
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3232
refs/heads/beta: 9854143cba679834bc4ef932858cd5303f015a0e
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35-
refs/heads/tmp: 03d3ba7667ed9599f46b742ac314a43297d76b19
35+
refs/heads/tmp: 35c261aea0d891d31b3fda83da653cb1e385681f
3636
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3737
refs/tags/homu-tmp: 53a183f0274316596bf9405944d4f0468d8c93e4
3838
refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/liballoc/boxed.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ pub static HEAP: () = ();
8686
/// See the [module-level documentation](../../std/boxed/index.html) for more.
8787
#[lang = "owned_box"]
8888
#[stable(feature = "rust1", since = "1.0.0")]
89+
#[fundamental]
8990
pub struct Box<T>(Unique<T>);
9091

9192
impl<T> Box<T> {

branches/tmp/src/liballoc/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
#![feature(no_std)]
7272
#![no_std]
7373
#![feature(allocator)]
74+
#![feature(custom_attribute)]
75+
#![feature(fundamental)]
7476
#![feature(lang_items, unsafe_destructor)]
7577
#![feature(box_syntax)]
7678
#![feature(optin_builtin_traits)]

branches/tmp/src/libcore/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@
7070
#![feature(unboxed_closures)]
7171
#![feature(rustc_attrs)]
7272
#![feature(optin_builtin_traits)]
73+
#![feature(fundamental)]
7374
#![feature(concat_idents)]
7475
#![feature(reflect)]
76+
#![feature(custom_attribute)]
7577

7678
#[macro_use]
7779
mod macros;

branches/tmp/src/libcore/marker.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ impl !Send for Managed { }
4949
#[stable(feature = "rust1", since = "1.0.0")]
5050
#[lang="sized"]
5151
#[rustc_on_unimplemented = "`{Self}` does not have a constant size known at compile-time"]
52+
#[fundamental] // for Default, for example, which requires that `[T]: !Default` be evaluatable
5253
pub trait Sized : MarkerTrait {
5354
// Empty.
5455
}

branches/tmp/src/libcore/ops.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,7 @@ impl<'a, T: ?Sized> DerefMut for &'a mut T {
11171117
#[lang="fn"]
11181118
#[stable(feature = "rust1", since = "1.0.0")]
11191119
#[rustc_paren_sugar]
1120+
#[fundamental] // so that regex can rely that `&str: !FnMut`
11201121
pub trait Fn<Args> : FnMut<Args> {
11211122
/// This is called when the call operator is used.
11221123
extern "rust-call" fn call(&self, args: Args) -> Self::Output;
@@ -1126,6 +1127,7 @@ pub trait Fn<Args> : FnMut<Args> {
11261127
#[lang="fn_mut"]
11271128
#[stable(feature = "rust1", since = "1.0.0")]
11281129
#[rustc_paren_sugar]
1130+
#[fundamental] // so that regex can rely that `&str: !FnMut`
11291131
pub trait FnMut<Args> : FnOnce<Args> {
11301132
/// This is called when the call operator is used.
11311133
extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
@@ -1135,6 +1137,7 @@ pub trait FnMut<Args> : FnOnce<Args> {
11351137
#[lang="fn_once"]
11361138
#[stable(feature = "rust1", since = "1.0.0")]
11371139
#[rustc_paren_sugar]
1140+
#[fundamental] // so that regex can rely that `&str: !FnMut`
11381141
pub trait FnOnce<Args> {
11391142
/// The returned type after the call operator is used.
11401143
type Output;

0 commit comments

Comments
 (0)