Skip to content

Commit 4924e81

Browse files
Seldaekalexcrichton
authored andcommitted
---
yaml --- r: 83662 b: refs/heads/try c: 1501d65 h: refs/heads/master v: v3
1 parent a5d487d commit 4924e81

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: 353578a7b36c003da8f5ac818a1554cdb652f9c2
5+
refs/heads/try: 1501d6511278028f1dfe597c85141dd835f0f073
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/trans/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
6565
let val = Call(bcx, llfn, [a, b], []);
6666
let result = ExtractValue(bcx, val, 0);
6767
let overflow = ZExt(bcx, ExtractValue(bcx, val, 1), Type::bool());
68-
let ret = C_undef(type_of::type_of(bcx.ccx(), t));
68+
let ret = Load(bcx, Alloca(bcx, type_of::type_of(bcx.ccx(), t), ""));
6969
let ret = InsertValue(bcx, ret, result, 0);
7070
let ret = InsertValue(bcx, ret, overflow, 1);
7171

branches/try/src/librustdoc/html/static/main.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ body {
121121

122122
.content pre.line-numbers { float: left; border: none; }
123123
.line-numbers span { color: #c67e2d; }
124+
.line-numbers .line-highlighted {
125+
background-color: #fff871;
126+
}
124127

125128
.content .highlighted {
126129
cursor: pointer;

branches/try/src/librustdoc/html/static/main.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,25 @@
3131
resizeShortBlocks();
3232
$(window).on('resize', resizeShortBlocks);
3333

34+
function highlightSourceLines() {
35+
var i, from, to, match = window.location.hash.match(/^#?(\d+)(?:-(\d+))?$/);
36+
if (match) {
37+
from = parseInt(match[1], 10);
38+
to = Math.min(50000, parseInt(match[2] || match[1], 10));
39+
from = Math.min(from, to);
40+
if ($('#' + from).length === 0) {
41+
return;
42+
}
43+
$('#' + from)[0].scrollIntoView();
44+
$('.line-numbers span').removeClass('line-highlighted');
45+
for (i = from; i <= to; i += 1) {
46+
$('#' + i).addClass('line-highlighted');
47+
}
48+
}
49+
}
50+
highlightSourceLines();
51+
$(window).on('hashchange', highlightSourceLines);
52+
3453
$(document).on('keyup', function (e) {
3554
if (document.activeElement.tagName === 'INPUT') {
3655
return;

0 commit comments

Comments
 (0)