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

Rolling up PRs in the queue #22475

Merged
merged 102 commits into from Feb 18, 2015
Merged

Rolling up PRs in the queue #22475

merged 102 commits into from Feb 18, 2015

Conversation

alexcrichton
Copy link
Member

No description provided.

iblech and others added 30 commits February 6, 2015 23:14
Without such a clarification, people who know and love closures (for instance
programmers with a Haskell background) might fear that types would have to
be declared in closures and that therefore using closures would be much more
unwieldy.
This aligns json target specification to match terminology used elsewhere in the code base.

[breaking-change] for custom target json users. Change all appearances of target-word-size
to target-pointer-width.
The `Arguments::new_v1_formatted` function was accidentally left out when this
module was stabilized.
Some newcomers might look for a "flatMap" method on Option. Include the
reference so that searching the page would find "and_then".
When matching against strings/slices, we call the comparison function
for strings, which takes two string slices by value. The slices are
passed in memory, and currently we just pass in a pointer to the
original slice. That can cause misoptimizations because we emit a call
to llvm.lifetime.end for all by-value arguments at the end of a
function, which in this case marks the original slice as dead.

So we need to properly create copies of the slices to pass them to the
comparison function.

Fixes rust-lang#22008
The other cases: `concat_idents!`, `log_syntax!`, and `trace_macros!`,
(these macros, with `asm!`, are handled (eagerly) in feature_gate.rs).
Requested by Niko in rust-lang#22200 (and is good to have anyway)
 - We shouldn't be using `check_name` here at all
 - `contains_name(ref_slice(foo), bar)` is redundant, `contains_name` just iterates over its first arg and calls `check_name`
 - match would be better than a bunch of ifs
This redux of CONTRIBUTING.md adds in more information, including
subsuming both compliment-bugreport.md and Note-development-policy
in the wiki.

I only glanced at the broad TOC of Note-development-policy, and did
not use the text as the basis for the re-write. This will then address
the last outstanding part of rust-lang#5831.
The test "signal_reported_right" send a signal `1` to `/bin/sh`, and check
the status code to check if the signal is reported right.

Under OpenBSD, the signal `1` (`SIGHUP`) is catched by `/bin/sh`,
resulting the test failed.

Use the uncatchable signal `9` (`SIGKILL`) for test.
This commit mostly replaces some of the uses of os::args with env::args.
@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member Author

@bors: r+ e9f42d7 p=100

@bors
Copy link
Contributor

bors commented Feb 18, 2015

⌛ Testing commit e9f42d7 with merge 04d7853...

@alexcrichton
Copy link
Member Author

@bors: r+ d424224 p=1000

@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-linux-32-nopt-t

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Contributor

bors commented Feb 18, 2015

⌛ Testing commit d424224 with merge 2badb94...

@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-mac-64-nopt-t

@alexcrichton
Copy link
Member Author

@bors: r+ 47f91a9 p=100

@bors
Copy link
Contributor

bors commented Feb 18, 2015

⌛ Testing commit 47f91a9 with merge d13fdb9...

@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-win-32-nopt-t

@dotdash
Copy link
Contributor

dotdash commented Feb 18, 2015

@bors retry

@bors
Copy link
Contributor

bors commented Feb 18, 2015

⌛ Testing commit 47f91a9 with merge eb836bf...

@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-win-32-opt

@huonw
Copy link
Member

huonw commented Feb 18, 2015

@bors retry

@Manishearth
Copy link
Member

(We'll merge this to master if http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3344 passes. Everything else except win32-opt and this have passed)

@Manishearth
Copy link
Member

win32-nopt passed.

@huonw huonw merged commit 47f91a9 into rust-lang:master Feb 18, 2015
huonw added a commit that referenced this pull request Feb 18, 2015
@alexcrichton alexcrichton deleted the rollup branch February 18, 2015 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet