Skip to content

Commit be998be

Browse files
fitzgenfitzgen
committed
s/servo/rust-lang-nursery/ \o/
Fixes rust-lang#852
1 parent 23dbe48 commit be998be

File tree

13 files changed

+32
-43
lines changed

13 files changed

+32
-43
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Use the `--dump-preprocessed-input` flag or the
1515
// `bindgen::Builder::dump_preprocessed_input` method to make your test case
1616
// standalone and without `#include`s, and then use C-Reduce to minimize it:
17-
// https://github.com/servo/rust-bindgen/blob/master/CONTRIBUTING.md#using-creduce-to-minimize-test-cases
17+
// https://github.com/rust-lang-nursery/rust-bindgen/blob/master/CONTRIBUTING.md#using-creduce-to-minimize-test-cases
1818
```
1919

2020
### Bindgen Invocation

‎CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ issue, provide us with:
4747

4848
## Looking to Start Contributing to `bindgen`?
4949

50-
* [Issues labeled "easy"](https://github.com/servo/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)
51-
* [Issues labeled "less easy"](https://github.com/servo/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-less-easy)
52-
* Still can't find something to work on? [Drop a comment here](https://github.com/servo/rust-bindgen/issues/747)
50+
* [Issues labeled "easy"](https://github.com/rust-lang-nursery/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)
51+
* [Issues labeled "less easy"](https://github.com/rust-lang-nursery/rust-bindgen/issues?q=is%3Aopen+is%3Aissue+label%3AE-less-easy)
52+
* Still can't find something to work on? [Drop a comment here](https://github.com/rust-lang-nursery/rust-bindgen/issues/747)
5353

5454
## Building
5555

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories = ["external-ffi-bindings", "development-tools::ffi"]
1111
license = "BSD-3-Clause"
1212
name = "bindgen"
1313
readme = "README.md"
14-
repository = "https://github.com/servo/rust-bindgen"
14+
repository = "https://github.com/rust-lang-nursery/rust-bindgen"
1515
documentation = "https://docs.rs/bindgen"
1616
version = "0.28.0"
1717
build = "build.rs"
@@ -24,7 +24,7 @@ exclude = [
2424
]
2525

2626
[badges]
27-
travis-ci = { repository = "servo/rust-bindgen" }
27+
travis-ci = { repository = "rust-lang-nursery/rust-bindgen" }
2828

2929
[lib]
3030
path = "src/lib.rs"

‎book/src/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Introduction
22

3-
**[`bindgen`](https://github.com/servo/rust-bindgen) automatically generates Rust
3+
**[`bindgen`](https://github.com/rust-lang-nursery/rust-bindgen) automatically generates Rust
44
FFI bindings to C and C++ libraries.**
55

66
For example, given the C header `cool.h`:

‎src/codegen/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ impl CodeGenerator for CompInfo {
16011601
// is making the struct 1-byte sized.
16021602
//
16031603
// This is apparently not the case for C, see:
1604-
// https://github.com/servo/rust-bindgen/issues/551
1604+
// https://github.com/rust-lang-nursery/rust-bindgen/issues/551
16051605
//
16061606
// Just get the layout, and assume C++ if not.
16071607
//
@@ -1703,7 +1703,7 @@ impl CodeGenerator for CompInfo {
17031703
)
17041704
};
17051705

1706-
// FIXME when [issue #465](https://github.com/servo/rust-bindgen/issues/465) ready
1706+
// FIXME when [issue #465](https://github.com/rust-lang-nursery/rust-bindgen/issues/465) ready
17071707
let too_many_base_vtables = self.base_members()
17081708
.iter()
17091709
.filter(|base| {

‎src/ir/analysis/template_params.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
9191
use super::{ConstrainResult, MonotoneFramework};
9292
use ir::context::{BindgenContext, ItemId};
93-
use ir::item::{Item, ItemSet};
93+
use ir::item::{Item, ItemCanonicalName, ItemSet};
9494
use ir::template::{TemplateInstantiation, TemplateParameters};
9595
use ir::traversal::{EdgeKind, Trace};
9696
use ir::ty::TypeKind;
@@ -224,7 +224,7 @@ impl<'ctx, 'gen> UsedTemplateParameters<'ctx, 'gen> {
224224
this_id: ItemId,
225225
used_by_this_id: &mut ItemSet,
226226
instantiation: &TemplateInstantiation) {
227-
trace!(" instantiation of blacklisted template, uses all template \
227+
println!(" instantiation of blacklisted template, uses all template \
228228
arguments");
229229

230230
let args = instantiation.template_arguments()
@@ -257,7 +257,7 @@ impl<'ctx, 'gen> UsedTemplateParameters<'ctx, 'gen> {
257257
this_id: ItemId,
258258
used_by_this_id: &mut ItemSet,
259259
instantiation: &TemplateInstantiation) {
260-
trace!(" template instantiation");
260+
println!(" template instantiation");
261261

262262
let decl = self.ctx.resolve_type(instantiation.template_definition());
263263
let args = instantiation.template_arguments();
@@ -275,13 +275,13 @@ impl<'ctx, 'gen> UsedTemplateParameters<'ctx, 'gen> {
275275
instantiation itself");
276276

277277
for (arg, param) in args.iter().zip(params.iter()) {
278-
trace!(" instantiation's argument {:?} is used if definition's \
278+
println!(" instantiation's argument {:?} is used if definition's \
279279
parameter {:?} is used",
280280
arg,
281281
param);
282282

283283
if used_by_def.contains(param) {
284-
trace!(" param is used by template definition");
284+
println!(" param is used by template definition");
285285

286286
let arg = arg.into_resolver()
287287
.through_type_refs()
@@ -311,7 +311,7 @@ impl<'ctx, 'gen> UsedTemplateParameters<'ctx, 'gen> {
311311
/// The join operation on our lattice: the set union of all of this id's
312312
/// successors.
313313
fn constrain_join(&self, used_by_this_id: &mut ItemSet, item: &Item) {
314-
trace!(" other item: join with successors' usage");
314+
println!(" other item: join with successors' usage");
315315

316316
item.trace(self.ctx, &mut |sub_id, edge_kind| {
317317
// Ignore ourselves, since union with ourself is a
@@ -332,7 +332,7 @@ impl<'ctx, 'gen> UsedTemplateParameters<'ctx, 'gen> {
332332
.iter()
333333
.cloned();
334334

335-
trace!(" union with {:?}'s usage: {:?}",
335+
println!(" union with {:?}'s usage: {:?}",
336336
sub_id,
337337
used_by_sub_id.clone().collect::<Vec<_>>());
338338

@@ -479,8 +479,8 @@ impl<'ctx, 'gen> MonotoneFramework for UsedTemplateParameters<'ctx, 'gen> {
479479
// an analog to slice::split_at_mut.
480480
let mut used_by_this_id = self.take_this_id_usage_set(id);
481481

482-
trace!("constrain {:?}", id);
483-
trace!(" initially, used set is {:?}", used_by_this_id);
482+
println!("constrain {:?} ({})", id, id.canonical_name(self.ctx));
483+
println!(" initially, used set is {:?}", used_by_this_id);
484484

485485
let original_len = used_by_this_id.len();
486486

@@ -489,7 +489,7 @@ impl<'ctx, 'gen> MonotoneFramework for UsedTemplateParameters<'ctx, 'gen> {
489489
match ty_kind {
490490
// Named template type parameters trivially use themselves.
491491
Some(&TypeKind::Named) => {
492-
trace!(" named type, trivially uses itself");
492+
println!(" named type, trivially uses itself");
493493
used_by_this_id.insert(id);
494494
}
495495
// Template instantiations only use their template arguments if the
@@ -508,7 +508,7 @@ impl<'ctx, 'gen> MonotoneFramework for UsedTemplateParameters<'ctx, 'gen> {
508508
_ => self.constrain_join(&mut used_by_this_id, item),
509509
}
510510

511-
trace!(" finally, used set is {:?}", used_by_this_id);
511+
println!(" finally, used set is {:?}", used_by_this_id);
512512

513513
let new_len = used_by_this_id.len();
514514
assert!(new_len >= original_len,
@@ -532,7 +532,7 @@ impl<'ctx, 'gen> MonotoneFramework for UsedTemplateParameters<'ctx, 'gen> {
532532
{
533533
if let Some(edges) = self.dependencies.get(&item) {
534534
for item in edges {
535-
trace!("enqueue {:?} into worklist", item);
535+
println!("enqueue {:?} into worklist", item);
536536
f(*item);
537537
}
538538
}

‎src/ir/comp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ impl CompInfo {
11361136
// Let's just assume that if the cursor we've found is a
11371137
// definition, it's a valid inner type.
11381138
//
1139-
// [1]: https://github.com/servo/rust-bindgen/issues/482
1139+
// [1]: https://github.com/rust-lang-nursery/rust-bindgen/issues/482
11401140
let is_inner_struct = cur.semantic_parent() == cursor ||
11411141
cur.is_definition();
11421142
if !is_inner_struct {

‎src/ir/function.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub fn cursor_mangling(ctx: &BindgenContext,
193193

194194
// We early return here because libclang may crash in some case
195195
// if we pass in a variable inside a partial specialized template.
196-
// See servo/rust-bindgen#67, and servo/rust-bindgen#462.
196+
// See rust-lang-nursery/rust-bindgen#67, and rust-lang-nursery/rust-bindgen#462.
197197
if cursor.is_in_non_fully_specialized_template() {
198198
return None;
199199
}
@@ -474,7 +474,7 @@ impl Trace for FunctionSig {
474474

475475
// Function pointers follow special rules, see:
476476
//
477-
// https://github.com/servo/rust-bindgen/issues/547,
477+
// https://github.com/rust-lang-nursery/rust-bindgen/issues/547,
478478
// https://github.com/rust-lang/rust/issues/38848,
479479
// and https://github.com/rust-lang/rust/issues/40158
480480
//

‎src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ impl Builder {
484484
/// implement some processing on comments to work around issues as described
485485
/// in:
486486
///
487-
/// https://github.com/servo/rust-bindgen/issues/426
487+
/// https://github.com/rust-lang-nursery/rust-bindgen/issues/426
488488
pub fn generate_comments(mut self, doit: bool) -> Self {
489489
self.options.generate_comments = doit;
490490
self
@@ -513,7 +513,7 @@ impl Builder {
513513
/// However, some old libclang versions seem to return incorrect results in
514514
/// some cases for non-mangled functions, see [1], so we allow disabling it.
515515
///
516-
/// [1]: https://github.com/servo/rust-bindgen/issues/528
516+
/// [1]: https://github.com/rust-lang-nursery/rust-bindgen/issues/528
517517
pub fn trust_clang_mangling(mut self, doit: bool) -> Self {
518518
self.options.enable_mangling = doit;
519519
self
@@ -1038,7 +1038,7 @@ pub struct BindgenOptions {
10381038
/// However, some old libclang versions seem to return incorrect results in
10391039
/// some cases for non-mangled functions, see [1], so we allow disabling it.
10401040
///
1041-
/// [1]: https://github.com/servo/rust-bindgen/issues/528
1041+
/// [1]: https://github.com/rust-lang-nursery/rust-bindgen/issues/528
10421042
pub enable_mangling: bool,
10431043

10441044
/// Whether to prepend the enum name to bitfield or constant variants.

‎src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ pub fn main() {
8080
fn print_verbose_err() {
8181
println!("Bindgen unexpectedly panicked");
8282
println!("This may be caused by one of the known-unsupported \
83-
things (https://github.com/servo/rust-bindgen#c), \
83+
things (https://github.com/rust-lang-nursery/rust-bindgen#c), \
8484
please modify the bindgen flags to work around it as \
85-
described in https://github.com/servo/rust-bindgen#c");
85+
described in https://github.com/rust-lang-nursery/rust-bindgen#c");
8686
println!("Otherwise, please file an issue at \
87-
https://github.com/servo/rust-bindgen/issues/new");
87+
https://github.com/rust-lang-nursery/rust-bindgen/issues/new");
8888
}

‎src/options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub fn builder_from_flags<I>
6565
Arg::with_name("no-doc-comments")
6666
.long("no-doc-comments")
6767
.help("Avoid including doc comments in the output, see: \
68-
https://github.com/servo/rust-bindgen/issues/426"),
68+
https://github.com/rust-lang-nursery/rust-bindgen/issues/426"),
6969
Arg::with_name("no-recursive-whitelist")
7070
.long("no-recursive-whitelist")
7171
.help("Avoid whitelisting types recursively."),

‎tests/headers/call-conv-field.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// The linux-only thing is a hack around our lack of understanding when
66
// bindgen's target_os != the bindings' target_os :(
77
//
8-
// https://github.com/servo/rust-bindgen/issues/593
8+
// https://github.com/rust-lang-nursery/rust-bindgen/issues/593
99

1010
struct JNINativeInterface_ {
1111
int (__stdcall *GetVersion)(void *env);

‎tests/test-one.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,9 @@ FLAGS="--with-derive-default --raw-line '' --raw-line '#![allow(dead_code, non_s
5050

5151
eval ./target/debug/bindgen \
5252
"\"$TEST\"" \
53-
--emit-ir \
54-
--emit-ir-graphviz ir.dot \
55-
--emit-clang-ast \
5653
-o "\"$BINDINGS\"" \
5754
$FLAGS
5855

59-
dot -Tpng ir.dot -o ir.png
60-
61-
echo
62-
echo "=== Input header ========================================================"
63-
echo
64-
65-
cat "$TEST"
66-
6756
echo
6857
echo "=== Generated bindings =================================================="
6958
echo

0 commit comments

Comments
 (0)