Skip to content

Commit 5eeafd7

Browse files
committed
---
yaml --- r: 226080 b: refs/heads/stable c: 6f7b4ce h: refs/heads/master v: v3
1 parent 0d8642f commit 5eeafd7

File tree

9 files changed

+371
-349
lines changed

9 files changed

+371
-349
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 4e2a898afcd890d44a45bd229dee8b9db8d330cc
32+
refs/heads/stable: 6f7b4ce65a286aa2a99d6028ce4b08889907a0c5
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/librustc/middle/dead.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
172172
};
173173
let fields = ty::lookup_struct_fields(self.tcx, id);
174174
for pat in pats {
175+
if let ast::PatWild(ast::PatWildSingle) = pat.node.pat.node {
176+
continue;
177+
}
175178
let field_id = fields.iter()
176179
.find(|field| field.name == pat.node.ident.name).unwrap().id;
177180
self.live_symbols.insert(field_id.node);

branches/stable/src/libstd/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@
148148
#![feature(vec_push_all)]
149149
#![feature(wrapping)]
150150
#![feature(zero_one)]
151+
#![cfg_attr(all(unix, not(target_os = "macos"), not(target_os = "ios")),
152+
feature(num_bits_bytes))]
151153
#![cfg_attr(windows, feature(str_utf16))]
152154
#![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras))]
153155
#![cfg_attr(test, feature(test, rustc_private, float_consts))]

branches/stable/src/libstd/process.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,24 @@ mod tests {
769769
}
770770
}
771771

772+
#[cfg(all(unix, not(target_os="android")))]
773+
pub fn pwd_cmd() -> Command {
774+
Command::new("pwd")
775+
}
776+
#[cfg(target_os="android")]
777+
pub fn pwd_cmd() -> Command {
778+
let mut cmd = Command::new("/system/bin/sh");
779+
cmd.arg("-c").arg("pwd");
780+
cmd
781+
}
782+
783+
#[cfg(windows)]
784+
pub fn pwd_cmd() -> Command {
785+
let mut cmd = Command::new("cmd");
786+
cmd.arg("/c").arg("cd");
787+
cmd
788+
}
789+
772790
#[cfg(all(unix, not(target_os="android")))]
773791
pub fn env_cmd() -> Command {
774792
Command::new("env")

0 commit comments

Comments
 (0)