Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #57995

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
809a1a8
mark str::string::String.trim.* functions as #[must_use].
matthiaskrgr Dec 24, 2018
e7ce868
Update src/libcore/str/mod.rs, tweak must_use message
zackmdavis Dec 25, 2018
74e9057
modify remaining #[must_use[ messages
matthiaskrgr Dec 26, 2018
4d65dd0
Fix aarch64 typo
Jan 20, 2019
c1858f2
Fix AArch64 typo in comments
Jan 20, 2019
8db66ca
use `SOURCE_DATE_EPOCH` for man page time if set
euclio Jan 26, 2019
1e57726
Introduce into_raw_non_null on Rc and Arc
dwijnand Jan 27, 2019
a75ae00
SGX target: improve panic & exit handling
Jan 29, 2019
84a89aa
Add link to the edition guide.
Jan 29, 2019
62867b4
Suggest to add each of `|` and `()` when unexpected `,` is found in p…
Krout0n Jan 30, 2019
7cfb05f
Merge `locals` and `local_layouts` fields
oli-obk Jan 30, 2019
bc528d9
Allow `layout_of_local` to also use cached layouts
oli-obk Jan 30, 2019
154c54c
Make priroda happy again
oli-obk Jan 30, 2019
4165c89
Can't use `layout_of_local` for the frame currently being created
oli-obk Jan 30, 2019
ab708f5
The return place's layout is only used once per frame, so caching doe…
oli-obk Jan 30, 2019
7017927
Indent fixup
oli-obk Jan 30, 2019
4e0af1f
Monomorphize types when not going through `layout_of_local`
oli-obk Jan 30, 2019
5aa713e
Eliminate an unwrap
oli-obk Jan 30, 2019
a3f0af2
Add MOVBE feature
Jan 30, 2019
a7a5cb6
Prefer macro over manual implementation
oli-obk Jan 30, 2019
765fa81
Swap the names of `LocalValue` and `LocalState`
oli-obk Jan 30, 2019
037fdb8
Improve bug message in check_ty
phansch Jan 30, 2019
8c26c59
Failure resistent trait implementing
oli-obk Jan 30, 2019
74675fe
Don't panic when accessing enum variant ctor using `Self` in match
estebank Jan 30, 2019
6fe370c
Pass correct arguments to places_conflict
matthewjasper Jan 30, 2019
0c21dfe
Rollup merge of #57008 - Knium:misleading-try-adding-parentheses-in-m…
Centril Jan 30, 2019
23958b6
Rollup merge of #57106 - matthiaskrgr:trim_must_use, r=sfackler
Centril Jan 30, 2019
8950561
Rollup merge of #57920 - euclio:source-date-epoch, r=Mark-Simulacrum
Centril Jan 30, 2019
f255361
Rollup merge of #57934 - dwijnand:from-Arc/Rc-to-NonNull, r=alexcrichton
Centril Jan 30, 2019
65c2996
Rollup merge of #57971 - jethrogb:jb/sgx-panic, r=alexcrichton
Centril Jan 30, 2019
20fcb16
Rollup merge of #57980 - siddharthasahu:patch-1, r=QuietMisdreavus
Centril Jan 30, 2019
db5e741
Rollup merge of #57984 - phansch:improve_check_ty_error, r=zackmdavis
Centril Jan 30, 2019
19b61d1
Rollup merge of #57987 - parched:va-args, r=michaelwoerister
Centril Jan 30, 2019
d8b75b8
Rollup merge of #57999 - jethrogb:jb/movbe-feature, r=alexcrichton
Centril Jan 30, 2019
b4cc10a
Rollup merge of #58000 - oli-obk:fixes_and_cleanups, r=RalfJung
Centril Jan 30, 2019
2e370a1
Rollup merge of #58007 - estebank:issue-58006, r=petrochenkov
Centril Jan 30, 2019
67ce50e
Rollup merge of #58008 - matthewjasper:places-conflict-args, r=oli-obk
Centril Jan 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use SOURCE_DATE_EPOCH for man page time if set
euclio committed Jan 26, 2019

Verified

This commit was signed with the committer’s verified signature.
euclio Andy Russell
commit 8db66ca53e9521f5ff52541e5793652688c3c367
16 changes: 14 additions & 2 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ use crate::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::compile;
use crate::tool::{self, Tool};
use crate::cache::{INTERNER, Interned};
use time;
use time::{self, Timespec};

pub fn pkgname(builder: &Builder, component: &str) -> String {
if component == "cargo" {
@@ -528,7 +528,19 @@ impl Step for Rustc {
t!(fs::create_dir_all(image.join("share/man/man1")));
let man_src = builder.src.join("src/doc/man");
let man_dst = image.join("share/man/man1");
let month_year = t!(time::strftime("%B %Y", &time::now()));

// Reproducible builds: If SOURCE_DATE_EPOCH is set, use that as the time.
let time = env::var("SOURCE_DATE_EPOCH")
.map(|timestamp| {
let epoch = timestamp.parse().map_err(|err| {
format!("could not parse SOURCE_DATE_EPOCH: {}", err)
}).unwrap();

time::at(Timespec::new(epoch, 0))
})
.unwrap_or_else(|_| time::now());

let month_year = t!(time::strftime("%B %Y", &time));
// don't use our `bootstrap::util::{copy, cp_r}`, because those try
// to hardlink, and we don't want to edit the source templates
for file_entry in builder.read_dir(&man_src) {