Skip to content

Commit b9c4782

Browse files
committed
---
yaml --- r: 148064 b: refs/heads/try2 c: 6be2bc8 h: refs/heads/master v: v3
1 parent ba3913a commit b9c4782

File tree

126 files changed

+1965
-3153
lines changed

Some content is hidden

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

126 files changed

+1965
-3153
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 777f1e8d24a5816a7ca1308ef4243201a6b81221
8+
refs/heads/try2: 6be2bc817bbb70ac13a1c2bb9647e01e2a156127
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/AUTHORS.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ Lindsey Kuper <[email protected]>
225225
Luca Bruno <[email protected]>
226226
Luis de Bethencourt <[email protected]>
227227
Luqman Aden <[email protected]>
228-
229228
Magnus Auvinen <[email protected]>
230229
Mahmut Bulut <[email protected]>
231230
maikklein <[email protected]>
@@ -241,7 +240,6 @@ Martin DeMello <[email protected]>
241240
Marvin Löbel <[email protected]>
242241
Matt Brubeck <[email protected]>
243242
Matt Carberry <[email protected]>
244-
Matthew Auld <[email protected]>
245243
Matthew Iselin <[email protected]>
246244
Matthew McPherrin <[email protected]>
247245
Matthew O'Connor <[email protected]>

branches/try2/Makefile.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# stageN - this is the system root, corresponding to, e.g. /usr
3434
# bin - binaries compiled for the host
3535
# lib - libraries used by the host compiler
36-
# rustlib - rustc's own place to organize libraries
36+
# rustc - rustc's own place to organize libraries
3737
# $(target) - target-specific artifacts
3838
# bin - binaries for target architectures
3939
# lib - libraries for target architectures
@@ -415,7 +415,6 @@ export CFG_LLVM_ROOT
415415
export CFG_ENABLE_MINGW_CROSS
416416
export CFG_PREFIX
417417
export CFG_LIBDIR
418-
export CFG_RUSTLIBDIR
419418

420419
######################################################################
421420
# Subprograms
@@ -436,7 +435,7 @@ HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
436435
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR)
437436

438437
# Destinations of artifacts for target architectures
439-
TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLIBDIR)/$(2)
438+
TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
440439
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
441440
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
442441

branches/try2/RELEASES.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Version 0.9 (January 2014)
22
--------------------------
33

4-
* ~1800 changes, numerous bugfixes
4+
* ~1600 changes, numerous bugfixes
55

66
* Language
77
* The `float` type has been removed. Use `f32` or `f64` instead.
@@ -22,9 +22,6 @@ Version 0.9 (January 2014)
2222
* `@fn`s have been removed.
2323
* `do` only works with procs in order to make it obvious what the cost
2424
of `do` is.
25-
* Single-element tuple-like structs can no longer be dereferenced to
26-
obtain the inner value. A more comprehensive solution for overloading
27-
the dereference operator will be provided in the future.
2825
* The `#[link(...)]` attribute has been replaced with
2926
`#[crate_id = "name#vers"]`.
3027
* Empty `impl`s must be terminated with empty braces and may not be
@@ -35,8 +32,6 @@ Version 0.9 (January 2014)
3532
* `printf!` and `printfln!` (old-style formatting) removed in favor of
3633
`print!` and `println!`.
3734
* `mut` works in patterns now, as in `let (mut x, y) = (1, 2);`.
38-
* The `extern mod foo (name = "bar")` syntax has been removed. Use
39-
`extern mod foo = "bar"` instead.
4035
* New reserved keywords: `alignof`, `offsetof`, `sizeof`.
4136
* Macros can have attributes.
4237
* Macros can expand to items with attributes.
@@ -81,7 +76,6 @@ Version 0.9 (January 2014)
8176
variables. Currently behind the `thread_local` feature gate.
8277
* The `return` keyword may be used in closures.
8378
* Types that can be copied via a memcpy implement the `Pod` kind.
84-
* The `cfg` attribute can now be used on struct fields and enum variants.
8579

8680
* Libraries
8781
* std: The `option` and `result` API's have been overhauled to make them
@@ -96,14 +90,9 @@ Version 0.9 (January 2014)
9690
* std: The reference counted pointer type `extra::rc` moved into std.
9791
* std: The `Gc` type in the `gc` module will replace `@` (it is currently
9892
just a wrapper around it).
99-
* std: The `Either` type has been removed.
10093
* std: `fmt::Default` can be implemented for any type to provide default
10194
formatting to the `format!` macro, as in `format!("{}", myfoo)`.
10295
* std: The `rand` API continues to be tweaked.
103-
* std: The `rust_begin_unwind` function, useful for insterting breakpoints
104-
on failure in gdb, is now named `rust_fail`.
105-
* std: The `each_key` and `each_value` methods on `HashMap` have been
106-
replaced by the `keys` and `values` iterators.
10796
* std: Functions dealing with type size and alignment have moved from the
10897
`sys` module to the `mem` module.
10998
* std: The `path` module was written and API changed.

branches/try2/configure

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ valopt datadir "${CFG_PREFIX}/share" "install data"
398398
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
399399
valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
400400
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
401-
valopt rustlibdir "rustlib" "subdirectory name for rustc's libraries"
402401

403402
# Validate Options
404403
step_msg "validating $CFG_SELF args"
@@ -776,16 +775,11 @@ do
776775
make_dir $h/stage$i/test
777776

778777
# target bin dir
779-
make_dir $h/stage$i/$CFG_LIBDIR/$CFG_RUSTLIBDIR/$t/bin
778+
make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
780779

781780
# target lib dir
782-
make_dir $h/stage$i/$CFG_LIBDIR/$CFG_RUSTLIBDIR/$t/$CFG_LIBDIR
781+
make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
783782
done
784-
785-
# Fix stage0:
786-
make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/bin
787-
make_dir $h/stage0/$CFG_LIBDIR/rustc/$t/$CFG_LIBDIR
788-
789783
done
790784

791785
make_dir $h/test/run-pass
@@ -798,12 +792,12 @@ do
798792
make_dir $h/test/debug-info
799793
make_dir $h/test/codegen
800794
make_dir $h/test/doc-tutorial
801-
make_dir $h/test/doc-guide-ffi
802-
make_dir $h/test/doc-guide-macros
803-
make_dir $h/test/doc-guide-borrowed-ptr
804-
make_dir $h/test/doc-guide-container
805-
make_dir $h/test/doc-guide-tasks
806-
make_dir $h/test/doc-guide-conditions
795+
make_dir $h/test/doc-tutorial-ffi
796+
make_dir $h/test/doc-tutorial-macros
797+
make_dir $h/test/doc-tutorial-borrowed-ptr
798+
make_dir $h/test/doc-tutorial-container
799+
make_dir $h/test/doc-tutorial-tasks
800+
make_dir $h/test/doc-tutorial-conditions
807801
make_dir $h/test/doc-rust
808802
done
809803

@@ -1037,7 +1031,6 @@ putvar CFG_HOST
10371031
putvar CFG_TARGET
10381032
putvar CFG_C_COMPILER
10391033
putvar CFG_LIBDIR
1040-
putvar CFG_RUSTLIBDIR
10411034
putvar CFG_DISABLE_MANAGE_SUBMODULES
10421035
putvar CFG_ANDROID_CROSS_PATH
10431036
putvar CFG_MINGW32_CROSS_PATH

branches/try2/doc/complement-bugreport.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)