wip

rust-lang · Dec 10, 2017 · 26a0515 · 26a0515
1 parent f4b1f76
commit 26a0515
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs
@@ -169,8 +169,8 @@ fn time_threads_impl<T, F>(what: &str, f: F) -> T where
         let mut high: u32;
 
         unsafe {
-            asm!("xor %%rax, %%rax; cpuid; rdtsc"
-                : "={eax}" (low), "={edx}" (high) :: "memory,rbx,rcx");
+            asm!("xor %rax, %rax; cpuid; rdtsc"
+                : "={eax}" (low), "={edx}" (high) :: "memory", "rbx", "rcx");
         }
 
         ((high as u64) << 32) | (low as u64)

diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
@@ -788,7 +788,7 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
         let err_count = ecx.parse_sess.span_diagnostic.err_count();
 
         let krate = time(time_passes, "expand crate", || {
-            ecx.monotonic_expander().expand_crate(krate);
+            ecx.monotonic_expander().expand_crate(krate)
         });
 
         time(time_passes, "check unused macros", || {