Skip to content

Commit 74816da

Browse files
committed
---
yaml --- r: 182352 b: refs/heads/beta c: 2d30f22 h: refs/heads/master v: v3
1 parent a3167a1 commit 74816da

File tree

125 files changed

+999
-2022
lines changed

Some content is hidden

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

125 files changed

+999
-2022
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 3bf41dafcfb6c979efb4e2438e047e1a54045eec
34+
refs/heads/beta: 2d30f2201409ce6b62af09342bb9b1cacb76681b
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,8 +1011,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10111011
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10121012
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10131013
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1014-
$(1) \
1015-
$$(S)
1014+
$(1)
10161015
@touch $$@
10171016
else
10181017
# FIXME #11094 - The above rule doesn't work right for multiple targets

branches/beta/src/doc/trpl/unsafe.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ in the same format as C:
447447

448448
```
449449
#![no_std]
450-
#![feature(lang_items, start)]
450+
#![feature(lang_items)]
451451
452452
// Pull in the system libc library for what crt0.o likely requires
453453
extern crate libc;
@@ -475,7 +475,7 @@ compiler's name mangling too:
475475
```ignore
476476
#![no_std]
477477
#![no_main]
478-
#![feature(lang_items, start)]
478+
#![feature(lang_items)]
479479
480480
extern crate libc;
481481
@@ -529,7 +529,7 @@ vectors provided from C, using idiomatic Rust practices.
529529

530530
```
531531
#![no_std]
532-
#![feature(lang_items, start)]
532+
#![feature(lang_items)]
533533
534534
# extern crate libc;
535535
extern crate core;
@@ -653,7 +653,7 @@ sugar for dynamic allocations via `malloc` and `free`:
653653

654654
```
655655
#![no_std]
656-
#![feature(lang_items, box_syntax, start)]
656+
#![feature(lang_items, box_syntax)]
657657
658658
extern crate libc;
659659

0 commit comments

Comments
 (0)