From a06c6bd63c520286c684456ef49a547d94031bf5 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 11 Dec 2017 22:30:04 +0100 Subject: [PATCH 1/4] Fix mobile doc style and improve search bar --- src/librustdoc/html/static/rustdoc.css | 18 ++++++++++++++---- src/librustdoc/html/static/styles/main.css | 13 +++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 99a0f8c3fb1ad..308182e6a0e71 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -822,6 +822,7 @@ span.since { margin-left: -15px; padding: 0 15px; position: static; + z-index: 1; } .sidebar > .location { @@ -848,25 +849,34 @@ span.since { } .sidebar-menu { - position: absolute; + position: fixed; + z-index: 10; font-size: 2rem; cursor: pointer; - margin-top: 2px; + width: 45px; + left: 0; + text-align: center; display: block; + border-bottom: 1px solid; + border-right: 1px solid; } .sidebar-elems { - background-color: #F1F1F1; position: fixed; z-index: 1; left: 0; top: 45px; bottom: 0; overflow-y: auto; - border-right: 1px solid #000; + border-right: 1px solid; display: none; } + .sidebar > .block.version { + border-bottom: none; + margin-top: 12px; + } + nav.sub { margin: 0 auto; } diff --git a/src/librustdoc/html/static/styles/main.css b/src/librustdoc/html/static/styles/main.css index 5cace837a5557..c31808cfc0f6d 100644 --- a/src/librustdoc/html/static/styles/main.css +++ b/src/librustdoc/html/static/styles/main.css @@ -330,3 +330,16 @@ pre.ignore:hover, .information:hover + pre.ignore { .modal-content > .close:hover + .whiter { background-color: #ff1f1f; } + +@media (max-width: 700px) { + .sidebar-menu { + background-color: #F1F1F1; + border-bottom-color: #e0e0e0; + border-right-color: #e0e0e0; + } + + .sidebar-elems { + background-color: #F1F1F1; + border-right-color: #000; + } +} From 557236c5086061cbf7d7347217f50c1ef73d0f1f Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 12 Dec 2017 00:19:36 +0100 Subject: [PATCH 2/4] Fix type filter in rustdoc js --- src/librustdoc/html/static/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 06e9cbbdf9a71..81971157b8492 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -911,24 +911,24 @@ searchWords[j].replace(/_/g, "").indexOf(val) > -1) { // filter type: ... queries - if (typePassesFilter(typeFilter, ty) && results[fullId] === undefined) { + if (typePassesFilter(typeFilter, ty.ty) && results[fullId] === undefined) { index = searchWords[j].replace(/_/g, "").indexOf(val); } } if ((lev = levenshtein(searchWords[j], val)) <= MAX_LEV_DISTANCE) { - if (typePassesFilter(typeFilter, ty) === false) { + if (typePassesFilter(typeFilter, ty.ty) === false) { lev = MAX_LEV_DISTANCE + 1; } else { lev += 1; } } if ((in_args = findArg(ty, valGenerics)) <= MAX_LEV_DISTANCE) { - if (typePassesFilter(typeFilter, ty) === false) { + if (typePassesFilter(typeFilter, ty.ty) === false) { in_args = MAX_LEV_DISTANCE + 1; } } if ((returned = checkReturned(ty, valGenerics)) <= MAX_LEV_DISTANCE) { - if (typePassesFilter(typeFilter, ty) === false) { + if (typePassesFilter(typeFilter, ty.ty) === false) { returned = MAX_LEV_DISTANCE + 1; } } From 6487ee34441987353a0d7e5d91a28877387c130a Mon Sep 17 00:00:00 2001 From: varkor Date: Tue, 12 Dec 2017 17:27:37 +0000 Subject: [PATCH 3/4] Fix return value of `LLVMRustMetadataAsValue` `LLVMRustMetadataAsValue` would previously return `void`, despite the corresponding Rust function expecting to return a `ValueRef`. --- src/rustllvm/RustWrapper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index ee48d49da4691..6f51ea67cb1d1 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -566,8 +566,8 @@ extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M, const char *Name, unwrap(M)->addModuleFlag(Module::Warning, Name, Value); } -extern "C" void LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) { - wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD))); +extern "C" LLVMValueRef LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) { + return wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD))); } extern "C" LLVMRustDIBuilderRef LLVMRustDIBuilderCreate(LLVMModuleRef M) { From c0c26a649e7c970203f6d23ac5c9e017a42d9b0c Mon Sep 17 00:00:00 2001 From: kennytm Date: Wed, 13 Dec 2017 04:23:12 +0800 Subject: [PATCH 4/4] Temporarily use the old Travis image. Use it until travis-ci/travis-ci#8891 is fixed. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b2840ac3121f8..c0a18ca552420 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: shell sudo: required dist: trusty +group: deprecated-2017Q4 services: - docker